893 files changed, 27693 insertions, 59185 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 4000438a4b5..91a0688b7de 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -58,8 +58,7 @@ Mistakes page</a>.<P>
   </tr>
   <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
+   <td>Windows 95, MVS, DEC Alpha Windows NT (MSVC++ 5.0), Chorus
    </td>
   </tr>
   <tr valign=top>
@@ -148,16 +147,17 @@ try to help you fix the problems.
       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.
+      a g++ or egcs that was built on an older SunOS host.<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>
+	  <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>
+  <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
@@ -167,7 +167,7 @@ try to help you fix the problems.
       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/
+      $(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
@@ -368,8 +368,8 @@ make: *** [libACE.so] Error 8
 
       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: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
       for help with this port.<P>
 
@@ -377,13 +377,13 @@ make: *** [libACE.so] Error 8
 
       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>
+      supports both -stable (2.2.x) and -current (3.0).  Threaded version of ACE is
+      only supported on -current.  It might just work for -stable but
+      we never tried that.  <p>
 
-      Notice that on older FreeBSD, <code>ld.so</code> only looks for so
+      Notice that on 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
+      create symlink for most libraries they generate to
       <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
@@ -391,11 +391,9 @@ make: *** [libACE.so] Error 8
 
       <code>ln -sf $ACE_ROOT/ace/libACE.so $ACE_ROOT/ace/libACE.so.4.5</code><p>
 
-      On newer FreeBSD (3.0 or later,) this is no longer necessary.<p>
-
   <li><b>NetBSD</b><p>
 
-      Like older FreeBSD, NetBSD's <code>ld.so</code> also requires
+      Like FreeBSD, NetBSD's <code>ld.so</code> also requires
       versioned .so files.<p>
 
   <LI><B> UnixWare </B> <P>
@@ -446,9 +444,7 @@ make: *** [libACE.so] Error 8
       <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>
+      and g++ 2.7.2 compilers.<P>
 
       In addition to all of the other benefits of ACE, it helps
       work around some deficiencies with VxWorks 5.3/5.3.1.
@@ -523,16 +519,6 @@ make: *** [libACE.so] Error 8
       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>
@@ -656,7 +642,8 @@ If you use the GNU GCC g++ compiler please note the following:
       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;
+      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>
 
@@ -801,21 +788,14 @@ need to do:<P>
       % make
       </code></pre><P>
 
-      at the root of the ACE source tree.  This will build the ACE
-      library, tests, the examples, and the sample applications.
-      Building the entire ACE release can take a long time and consume
-      lots of disk space, however.  Therefore, you might consider
-      cd'ing into the <A HREF="ace">$ACE_ROOT/ace/</a> directory and
-      running <CODE>make</CODE> there to build just the ACE library.
-      As a sanity check, you might also want to build and run the
-      automated <A HREF="tests/README">``one-button'' tests</A> in <A
-      HREF="tests/">$ACE_ROOT/tests/</a>.  Finally, if you're also
-      planning on building <A
-      HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A>, you
-      should build the <A
-      HREF="http://www.cs.wustl.edu/~schmidt/gperf.ps.gz">gperf</A>
-      perfect hash function generator application in <A
-      HREF="apps/gperf">$ACE_ROOT/apps/gperf/</A>.<P>
+      at the root of the ACE source tree.  This will build the ACE library,
+      tests, the examples, and the sample applications.  Building the entire
+      ACE release can take a long time, however.  Therefore, you might
+      consider cd'ing into the $ACE_ROOT/ace/ directory and running
+      <CODE>make</CODE> there to build just the ACE library.  As a sanity
+      check, you might also want to build and run the automated <A
+      HREF="tests/README">``one-button'' tests</A> in
+      $ACE_ROOT/tests/.<P>
 
   <LI>If you need to regenerate the Svc_Conf_y.cpp file, you'll need to
       get <A HREF="http://www.cs.wustl.edu/~schmidt/byacc.tar.gz">Berkeley
@@ -862,9 +842,10 @@ 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>
-for details.  Thank you to <A HREF="mailto:ben@jetpen.com">Ben Eng</A>
-for the pointer to the STL fixes.
+<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.
 
 <OL>
   <LI>Uncompress the ACE distribution into a directory, where it will create a
@@ -903,7 +884,7 @@ for the pointer to the STL fixes.
       <BR>
       before the #include statement in ACE_ROOT\ace\config.h.<BR>
       <br>
-  <li>To use ACE with MFC libraries, also add the following to
+  <li>If ACE will be used with MFC programs, also add the following to
       your <code>config.h</code> file.  Notice that if you want to
       spawn a new thread with CWinThread, make sure you spawn the
       thread with THR_USE_AFX flag set.<br>
@@ -919,15 +900,8 @@ for the pointer to the STL fixes.
       you prefer to link MFC as a static library into ACE, you can do
       this by defining <code>ACE_USES_STATIC_MFC</code> in your
       <code>config.h</code> file.  If you insist on linking everything
-      statically, you'll have to modify the project file yourself.<p>
-  <li>Static version of ACE libraries are build with the following macros defined:<br>
+      statically, you'll have to modify the project file yourself.<br>
       <br>
-      <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 
-      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>
       <br>
       <code>#define ACE_HAS_WINCE</code>
@@ -954,9 +928,9 @@ for the pointer to the STL fixes.
       run-time libraries even you are using ACE as a static library.
       That's the default behavior.<BR><BR>
 
-  <li><a href="http://www.torus-software.com/">Barry
+  <li><a href="http://www.panix.com/~hoggardb/index.shtml">Barry
       Hoggard</a> maintains a <a
-      href="http://www.torus-software.com/corba/">CORBA Page</a>
+      href="http://www.panix.com/~hoggardb/corba/">CORBA Page</a>
       which contains very helpful information on setting MSVC project
       settings.  You'll need to filter out stuff related to TAO if you
       only use ACE.<br><br>
@@ -1436,8 +1410,7 @@ Here's what you need to do:<P>
       <A HREF="ACE-papers.html#config">Service Configurator</A>
       documentation to learn how the configuration file is parsed and
       how the services are dynamically linked and executed.  In
-      addition, refer to the <A
-      HREF="http://www.cs.wustl.edu/~schmidt/ACE-netsvcs.html">Network
+      addition, refer to the <A HREF="ACE-netsvcs.html">Network
       Services</A> documentation to learn more about how to configure
       each network service.<P>
 
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 74118d45666..3371a9fbbd2 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,674 +1,24 @@
-Wed Jun 16 12:00:21 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-	* ace/SOCK_Dgram_Mcast.cpp:
-	  Changed a -1 to ACE_INVALID_HANDLE.
-
-Wed Jun 16 07:40:05 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Thread_Manager_Test.cpp: updated comment about not
-          using kill_grp on sun.  It's not due to bugs, but rather
-          thr_self () is not documented as being Async-Signal-Safe.
-          And, removed 5 second sleep on sun because it's no longer
-          needed.
-
-Wed Jun 16 02:07:29 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp (spawn_i):  Fixed possible access before
-          initialization warnings when compiling with egcs with exception
-          enabled.  Thanks to Carlos for pointing this out.
-
-        * ACE-INSTALL.html: Updated FreeBSD and Win32 static library
-          instructions.
-
-Tue Jun 15 23:15:30 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp: Removed explicit template instantiation
-          for ACE_read_guard <ACE_thread_mutex> since a recent change by
-          Kirthika makes it unnecessary.
-
-Tue Jun 15 17:41:38 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/SOCK_Dgram_Mcast: Added initial support for the Win2K
-          QoS-enabled multicast features.  The current implementation
-          hasn't been tested, and probably doesn't work, but we're still
-          designing the API at this point.
-
-        * ace/OS: Added a new wrapper for WSASocket(), which is needed for
-          all the new GQoS stuff.
-
-        * ace/SOCK_Dgram_Mcast: The API for many of the methods in this
-          class was broken since it was different for pSoS and for
-          non-pSoS platforms, which violates "The ACE Way."  The fix is to
-          make the API the same, i.e., use ASYS_TCHAR * consistently, and
-          then handle this by converting these into numbers via
-          ACE_OS::atoi() where necessary, e.g., for pSoS.
-
-        * ACE-INSTALL.html: Updated the documentation to recommend
-          building gperf so that TAO's IDL compiler will work optimally.
-          Thanks to Jim Penny <jpenny@universal-fasteners.com> for
-          suggesting this.
-
-Tue Jun 15 22:26:43 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * tests/DLL_Test.cpp
-        * tests/Upgradable_RW_Test.h,cpp
-        * ace/Thread_Manager.h,cpp
-        * ace/Template_Instantiations.cpp
-        * ace/Containers_T.h,cpp,i
-        * ace/Containers.h,cpp: Added new classes
-          ACE_Double_Linked_List_Iterator_Base,
-          ACE_Double_Linked_List_Reverse_Iterator and
-          ACE_DLList_Reverse_Iterator. I also had to adjust friend
-          declarations accordingly (as the iterator base and reverse
-          iterators also needed to be declared friend). This change
-          involved moving much of the functionality of the iterators into
-          the base class a la template method. Many thanks to Chris Gill
-          for help with this (M-x all-hail-chris-gill). I fear what this
-          may break in spite of all my tests, so I apologise in advance
-          for any chaos...
-
-Tue Jun 15 17:55:04 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.i:
-          Several fields of the FLOWSPEC structure are not present in the
-          terminal server version of Winsock2, they are only used if
-          ACE_HAS_WINNT5 is defined, the macro is *not* automatically
-          defined because we couldn't figure out a way to automagically
-          determine the OS version.
-
-Tue Jun 15 15:22:53 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Added ACE_HAS_BROKEN_T_ERROR.
-
-        * ace/ATM_Addr.cpp:
-        * ace/DEV_Addr.cpp:
-        * ace/FILE_Addr.cpp:
-        * ace/INET_Addr.cpp:
-        * ace/SPIPE_Addr.cpp: Initialize base class (ACE_Addr) from alternate
-          constructors. Not always necessary, but safe, and keeps egcs quiet.
-
-        * apps/Gateway/Gateway/Makefile:
-        * apps/Gateway/Peer/Makefile:
-        * examples/ASX/CCM_App/Makefile:
-        * examples/Service_Configurator/IPC-tests/Makefile:
-        * examples/Service_Configurator/Misc/Makefile:
-        * examples/Timer_Queue/Makefile:
-          Added LIBS += $(ACELIB) to include libACE when linking the
-          shared libs.  Removed VLDLIBS lines because they're set in
-          wrapper_macros.GNU, and it knows to do it correctly for AIX.
-
-        * examples/Connection/misc/Connection_Handler.cpp (handle_input):
-          corrected signed/unsigned mismatch.
-
-Tue Jun 15 13:41:15 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Thread_Manager_Test.cpp (main): Don't call kill_grp() on
-          Solaris since this seems to trigger occasional panics in the
-          thread library, probably due to the fact that thr_self() isn't
-          async signal safe.
-
-Tue Jun 15 14:32:43 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux-10.x.h: Added ACE_HAS_BROKEN_T_ERROR.
-
-        * ace/config-hpux-10.x-hpc++.h: Added
-          ACE_HAS_STD_TEMPLATE_SPECIALIZATION.
-
-        * ace/OS.i (t_error): Changed naked cast to ACE_const_cast.
-
-        * ace/Containers_T.cpp: Added ACE_TYPENAME where HP-UX aC++ said it
-          was needed.
-
-Tue Jun 15 13:44:04 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/OS.h: Moved the typedef of ACE_SIGNAL_C_FUNC to after when
-          siginfo_t has been declared and changed siginfo to siginfo_t.
-
-Tue Jun 15 13:17:01 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/OS.h:
-        * ace/POSIX_Proactor.h:
-        * ace/POSIX_Proactor.cpp:
-
-          Fixed the warning (Anachronism): Assigning
-          void(*)(int,siginfo*,void*) to extern "C"
-          void(*)(int,siginfo*,void*), came from the sunCC 5.0.
-
-          Defined the macro ACE_SIGNAL_C_FUNC in the OS.h.
-
-Tue Jun 15 12:41:22 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h,config-qnx-neutrino.h: moved some #includes from
-          config-qnx-neutrino.h to OS.h.
-
-        * include/makeinclude/platform_qnx_neutrino.GNU: enabled -Wall.
-
-        * ACE-INSTALL.html: added QNX Neutrino info.
-
-Tue Jun 15 12:26:06 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/Map_Manager_Test.cpp: Added template instantiations for
-          ACE_Reference_Pair and ACE_Cache_Map_Reverse_Iterator.
-
-Tue Jun 15 11:59:09 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-qnx-neutrino.h: removed a handful of #defines
-          that are in config-g++-common.h.
-
-        * ace/config-g++-common.h: removed the question about whether
-          some of the advanced features work with g++ 2.8.x.  They do
-          (with g++ 2.8.1, at least).
-
-Tue Jun 15 09:28:34 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: Added ACE_HAS_SSIZE_T for egcs.
-
-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.
-
-        * 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.
-
-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.
-
-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/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>
-
-        * ace/config-qnx-neutrino.h,
-          include/makeinclude/platform_qnx_neutrino.GNU: added config
-          files for QNX Neutrino.  They support cross-compiling on a
-          QNX4 host for Neutrino target.  Builds are almost (but not
-          completely) clean.
-
-        * include/makeinclude/platform_qnx_neutrino.GNU: only
-          build static libs, because they seem to work better.  Many
-          of the ACE tests pass with this configuration!  (Some of
-          the usual suspects, such as Conn_Test, don't.)
-
-        * ace/config-qnx-neutrino.h: don't need ACE_HAS_PENTIUM here,
-          because it's in config-g++-common.h.  Removed
-          ACE_HAS_USING_KEYWORD, because g++ 2.8.1 doesn't support
-          namespaces.
-
-Mon Jun 14 14:33:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Reactor_Performance_Test.cpp (handle_input): removed
-          printout when result == 0.  It happens when the client finishes
-          first, which I think is OK.
-
-Mon Jun 14 11:55:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix4_g++.GNU: New platform file for AIX
-          4.x using GNU compiler. Been tested w/ egcs 1.1.2.
-
-        * include/makeinclude/platform_aix4_cset++.GNU: Make shared libs
-          correctly and without building the static one first.
-          Also, for cset++, disable warnings on AIX 4.3 to shut up the
-          0-valued preprocessor warnings. This is not a great
-          long-term general solution, but it'll do the job.
-
-        * include/makeinclude/wrapper_macros.GNU:
-        * include/makeinclude/rules.lib.GNU: On AIX, build shared lib w/o
-          requiring static one first. When building shared libs, also link
-          against them and install the proper files when done. The correct
-          files built for libfoo are:
-             libfoo.a: archive/static library
-             libfoo.so: shared library, but not set up for run-time linker.
-                        This is the one loaded by ACE dynamic loading.
-             libfooshr.a: an archive library with libfoo.so as its only
-                        member. This is what to link against when building
-                        a program/library that uses libfoo.
-
-          Silly?  Uh-huh. But that's life in AIX land. I tried to get things
-          building/running clean using the run-time linker (-brtl) but had
-          no end of trouble. And, since no other libs in /usr/lib want to
-          do it that way either, it's like this.
-
-Mon Jun 14 09:58:02 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.i: Added ACE_UNUSED_ARG() macros for all the non-WINSOCK2
-          cases in the ACE_Flow_Spec and ACE_QoS methods.  Thanks to David
-          for reporting this.
-
-        * ace/OS.i: Moved the definition of ACE_Errno_Guard's methods to
-          earlier in the file to avoid problems with inline ordering.
-          Thanks to David for reporting this.
-
-        * ACE-INSTALL.html: Updated Barry Hoggard's CORBA page URL.
-
-Mon Jun 14 07:17:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: fixed typo: exceptions.
-
-Sun Jun 13 14:22:54 1999  Douglas C. Schmidt  <schmidt@maxixe.cs.wustl.edu>
-
-        * ace/LSOCK_Acceptor.cpp: Rewrote the accept() method to use the
-          same new technique that's used in ACE_SOCK_Acceptor::accept().
-          This is necessary since there's no longer a shared_accept().
-
-        * ace/SOCK_Acceptor: Removed shared_accept() since it's been split
-          into two parts to make the QoS features easier to maintain.
-
-        * ace/SOCK_Acceptor: Added the new ACE_Accept_QoS_Params parameter
-          to the ACE_SOCK_Acceptor::accept().  Also created two new
-          private methods, shared_accept_start() and
-          shared_accept_finish(), that factor out common code.
-
-        * ace/SOCK_Connector: Added the new ACE_Connect_QoS_Params
-          parameter to ACE_SOCK_Connector::connect().  Also created two
-          new private methods, shared_connect_start() and
-          shared_connect_finish(), that factor out common code.
-
-        * ace/SOCK_Connector.cpp: Cleaned up the logic that checks for
-          various types of errors and updated the code to use the new
-          ACE_Errno_Guard features.
-
-        * ace/OS.h: Added an equality and in-equality operator for
-          ACE_Errno_Guard and moved all the methods into OS.i rather than
-          OS.h.  Also added an ACE_Export to the ACE_Errno_Guard class so
-          that it can be used outside of the ACE library.
-
-        * ace/OS.h: For Win32, added support for the WinSock2 QoS
-          functions WSAAccept(), WSAConnect(), WSAJoinLeaf(), and
-          WSAIoctl().
-
-        * ace/OS.h: For Win32, added thin wrappers ACE_Flow_Spec and
-          ACE_QoS that encapsulate the WinSock2 FLOWSPEC and QOS structs,
-          respectively.
-
-        * ace/OS.h: For Win32, added an implicit conversion operator from
-          iovec to WSABUF since they are structurally equivalent.
-
-Sun Jun 13 14:22:54 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * bin/README.html: Updated the information about the ACE
-          documentation tools to be more helpful.
-
-Fri Jun 11 20:04:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * bin/Process_Unix.pm:
-          Fixed problems on TimedWait().
-
-Fri Jun 11 15:28:44 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.h: Need to add #include <signal.h> before <pthread.h>
-          since pthread.h doesn't include signal.h on SunOS 5.7.  Thanks
-          to Rick Weisner <rick.weisner@east.sun.com> for reporting this.
-
-        * ace/OS: ACE_OS::memchr() should return a const void * rather
-          than a void *.  Thanks to Rick Weisner
-          <rick.weisner@east.sun.com> for reporting this.
-
-        * ace/Dirent.i: Don't call closedir() on a NULL dirp because some
-          platforms (such as SunOS 5.7) will segfault!  Thanks to Tom
-          Arbuckle <arbuckle@uran.informatik.uni-bonn.de> for pointing
-          this out.
-
-Fri Jun 11 14:47:47 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * bin/auto_compile: Does not compile all the directories in TAO,
-          because it takes too much space (and time).  Run several more
-          tests in TAO that are stable.  Improve output.
-
-        * ace/Log_Msg.cpp: Use ACE_HAS_THR_C_DEST for TSS "destructors",
-          not ACE_HAS_THR_C_FUNC.
-
-        * bin/ACEutils.pm:
-        * bin/Process_Unix.pm:
-        * bin/Process_Win32.pm: Added new routines to wait for a process
-          with a timeout, ditto for the ACE::waitforfile() routine.  They
-          can be used to write more reliable test drivers.
-
-Fri Jun 11 14:40:49 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/create_ace_build: run the directory mode value through eval,
-          to convert it from octal to decimal, if necessary.  Thanks to
-          Russ Noseworthy for providing the patch.
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: only set
-          TEMPLATE_REPOSITORY for Sun C++ 4.2.  5.0 doesn't need it.
-          Thanks to Dennis C. De Mars <demars@mminternet.com> for
-          reporting this.
-
-        * tests/Reactor_Performance_Test.cpp (main): return error status
-          from run_event_loop () call.  And, added a few ACE_ERROR
-          printouts.  Thanks to Steve for mentioned this.
-
-        * ace/config-sunos5.5.h: properly reverted all the changes of
-          today.  The comments are more helpful this way.
-
-        * include/makeinclude/platform_linux_lxpthread.GNU: changed
-          PLATFORM_AIO_SUPPORT to use := instead of =, so that it only
-          invokes the shell once.  Thanks to Lothar Werzinger
-          <lwerzinger@krones.de> for suggesting this.
-
-Fri Jun 11 12:10:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * tests/RB_Tree_Test.{cpp, h (new)}: factored out class template
-          declaration into a .h file to make AIX C++ happy.
-
-Thu Jun 10 23:11:36 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * ace/Cache_Map_Manager_T.{h, i, cpp}: Added Iterator
-          implementations to the template parameters to be able to build
-          using the g++ compiler. Also removed unnecessary HASH_KEY and
-          COMPARE_KEYS from the template list.
-
-        * ace/Hash_Cache_Map_Manager_T.{h, i, cpp}: Made appropriate
-          changes to support changes made to Cache_Map_Manager.
-
-        * ace/Caching_Strategies_T.{h, i, cpp}: Added an overloaded
-          clear_cache method which allows the user to specify the total
-          number of entries in the cache. Also added the
-          Caching_Strategy_Utility parameter which decouples the actual
-          purging from the caching strategy.
-
-        * ace/Caching_Strategy_Utility.{h,i,cpp}: Added a Null version of
-          the utility to be used with the Null strategy.
-
-        * ace/Cleanup_Strategies_T.{h,i,cpp}: Added the ACE_UNSED_ARGS
-          macro to ward of g++ warnings.
-
-        * tests/Map_Manager_Test.cpp: Added performance tests for the
-          Cache_Map_Manager and the Hash_Cache_Map_Manager.
-
-Thu Jun 10 20:29:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.h: Made constructors for iterator base class
-          protected instead of protected, so the the base class can only
-          be constructed by the derived forward and reverse iterator
-          classes.  Thanks to Matt Braun for pointing this out.
-
-        * tests/RB_Tree_Test.cpp: Major overhaul of the test to use a test
-          class template that encapsulates the test details and makes the
-          code much more readable.  Then, the main program merely
-          instantiates a test for each of the four possible combinations
-          of key/item type parameterization over int and const char *, and
-          calls the run_test () method of each test instance.
-
-Thu Jun 10 12:44:22 1999  Steve Huston  <shuston@riverace.com>
-
-        * tests/UPIPE_SAP_Test.cpp: Disable for Win32 if !ACE_HAS_WINNT4.
-          The test relies on ACE_SPIPE_Acceptor which requires NT4 to
-          work.
-
-Thu Jun 10 12:47:52 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-linux-lxpthreads.h: removed ACE_HAS_AIO_CALLS.  It's
-          now enabled in the platform_macros.GNU file:
-
-        * include/makeinclude/platform_linux_lxpthread.GNU: added
-          automatic detection of AIO support, based on existence of
-          /usr/lib/librt.so.
-
-        * include/makeinclude/platform_linux_lxpthread.GNU: add -lrt to
-          LIBS only if $(PLATFORM_AIO_SUPPORT) is equal to
-          -DACE_HAS_AIO_CALLS.
-
-        Thanks to Jake Hamby <jehamby@anobject.com> for reporting that not
-        all Linux platforms have AIO support.
-
-Thu Jun 10 10:17:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-sunos5.5.h: with Sun C++ 5.0, #define
-          _RWSTD_NO_EXCEPTIONS 1 if exceptions are not enabled.  This
-          avoids a warning about throw expressions being ignored with
-          -noex.  See /opt/SUNWspro_5.0/SC5.0/include/CC/stdcomp.h for
-          more information.
-
-        * ace/os-patches/vxworks-5.1.txt,ACE-INSTALL.html: added these
-          notes for using ACE with VxWorks 5.1.
-
-        * docs/ACE-guidelines.html: avoid source code filenames that
-          include "Error".  Avoid #include <math.h>.
-
-Wed Jun  9 21:45:24 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/Svc_Handler_Test.cpp (main): Revised the test a bit to
-          make it more clear what's going on.
-
-        * ace/Svc_Handler.cpp: Fixed a typo in flush() -- we need to
-          update the temp pointer with temp->cont() *not* entry->cont().
-
-        * ace/Svc_Handler.cpp (dump): Fixed a typo -- I wasn't comparing
-          the pointer to 0, I was comparing the ACE_Time_Value!
-
-Wed Jun  9 21:10:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/config-psos-diab-ppc.h: added
-          ACE_HAS_NONCONST_SELECT_TIMEVAL
-
-        * tests/RB_Tree_Test.cpp: fixed constness issues revealed by
-          SunC++ 5.0, added return value assertions for insert calls,
-          added typedefs.
-
-Wed Jun  9 20:40:50 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.cpp: Added new methods to support message
-          reassembly in GIOP 1.1
-
-Wed Jun  9 15:32:37 1999  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
-
-        * ace/Message_Queue_T: Added a lock() accessor method so that
-          other components can access the lock used by a Message Queue.
-
-        * ace/Svc_Handler.cpp: Added better support for timeout handling
-          for the ACE_Buffered_Svc_Handler.
-
-        * ace/Svc_Handler: Split the buffering portion of ACE_Svc_Handler
-          off into a separate class called ACE_Buffered_Svc_Handler to
-          avoid adding extra space and complexity to the existing
-          ACE_Svc_Handler.  Thanks to Irfan for suggesting this, as well
-          as also suggesting ways to improve the performance by caching
-          the current size of the buffer.
-
-        * ace/OS.h: Added a patch to work around some problems with macros
-          for USYNCH_THREAD.  Thanks to David Levine and Russ Noseworthy
-          for this.
-
-        * examples/Threads/task_five.cpp (main): Improved the form and
-          content of this example a bit.
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU,
-        * include/makeinclude/platform_sunos5_g++.GNU,
-        * include/makeinclude/platform_irix6.x_g++.GNU,
-        * include/makeinclude/platform_linux_lxpthread.GNU,
-        * include/makeinclude/platform_irix6.x_sgic++.GNU:
-          Added support to make it easier to override various settings
-          in platform_macros files.  Thanks to Dave Meyer
-          <dmeyer@lima.arl.std.saic.com> for contributing this.
-
-        * ace/SPIPE_Stream: Added sendv(), sendv_n(), and recvv_n()
-          methods to SPIPE_Stream.  Thank to Carlos for pointing this out.
-
-        * ace/config-mvs.h: Changed the size of the ACE_SIZEOF_DOUBLE and
-          ACE_SIZEOF_LONG_DOUBLE from 4 and to 8 and 16, respectively.
-          Thanks to Jim Rogers for reporting this.
-
-        * ace/config-mvs.h: Added ACE_HAS_NONCONST_SELECT_TIMEVAL on the
-          advice of Jim Rogers <jrogers@viasoft.com>.
-
-        * ace/OS.h (class ACE_Errno_Guard): Propagate the return value of
-          the assignment operator to allow chaining.  Thanks to Jeff for
-          reporting this.
-
-
-        * ace/OS.i: Fixed a bizzarre problem with lower-case ace_os::.
-          Thanks to Andy for pointing this out.
-
-        * ace/Svc_Conf.y: Don't enable YYDEBUG by default so that we can
-          save some space in the generated code.
-
-        * ace/OS: Added several more uses of ACE_Errno_Guard, which has
-          been enhanced to support assignment.  Thanks to Irfan for
-          suggesting this.
-
-        * tests/Svc_Handler_Test.cpp: Added a simple test for the new
-          buffering feature in ACE_Svc_Handler.
-
-        * ace/Strategies.cpp: Added an explicit template instantiation for
-          ACE_Message_Queue_Iterator <ACE_NULL_SYNCH> since this is now
-          used in ACE_Svc_Handler.
-
-        * ace/Svc_Handler: Added a "buffering" feature to the
-          ACE_Svc_Handler.  This feature makes it possible to queue up
-          ACE_Message_Blocks in an ACE_Message_Queue until (1) the queue
-          is "full" or (2) a period of time elapses, at which point the
-          queue is "flushed" via sendv_n() to the peer.
-
-Wed Jun  9 12:23:30 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tests/version_tests/version_tests.dsw:
-        * tests/run_tests.bat:
-        * tests/run_tests.psosim:
-        * tests/run_tests.vxworks:
-          Added Svc_Handler_Test to these.
-
-        * tests/tests.dsw:
-          Added Svc_Handler_Test.dsp (created and checked in by
-          Nanbor) to the workspace.
-
-Wed Jun  9 10:46:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Strategies.cpp:
-          Moved template instantiations to ace/Service_Types.cpp
-
-        * ace/Service_Types.cpp:
-          Added missing template instantiations for
-          ACE_Message_Queue_Iterator<>
-
-        * ace/Svc_Handler.cpp (flush):
-          Removed extra characters and the end of a #endif
-          Fixed warning about unused variable
-          Use right iterator for the Message_Queue
-
-Wed Jun 09 10:11:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-g++-common.h: added #define of
-          ACE_NEW_THROWS_EXCEPTIONS, with egcs if ACE_HAS_EXCEPTIONS is
-          #defined.  That allows ACE's New_Fail_Test to pass.  Thanks
-          to Jake Hamby <jehamby@anobject.com> for providing the fix.
-
-Tue Jun  8 22:44:18 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * Hacked BYACC to generate a parser that doesn't have any
-          incorrect const char *'s.  This clears the last major const
-          issue in libACE.
-
-Tue Jun  8 20:46:05 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * ace/Functor.i,h:
-          Migrated ACE_Hash template specializations to the ace type
-          wrappers (ACE_UINT16, etc).
-
-Tue Jun  8 15:47:06 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
-
-        * ace: Updated most of the places in ACE that can benefit from the
-          new ACE_Errno_Guard class.
-
-        * ace/OS.h: Added a new ACE_Errno_Guard class that improves
-          performance when thread-specific errno must be saved/restored in
-          a block of code.  Thanks to Serge Kolgan <skolgan@cisco.com> for
-          motivating this and to Rick Weisner <Rick.Weisner@East.Sun.COM>
-          for explaining the technique to Serge.
-
-        * ace/Env_Value_T.h: Added a new ACE_Convert() function that works
-          for const char *'s.  Thanks to David for reporting this.
-
-Tue Jun 08 18:08:41 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.h: Added new overridable macro, ACE_LOCALHOST. This allows
-          overriding of the string used to do a loopback IP socket to the
-          local host. Some systems (e.g. PharLap ETS) don't have a host table
-          out of the box, and require an IP address string.
-
-        * ace/Pipe.cpp: Use the new ACE_LOCALHOST macro instead of a hard
-          "localhost" when using a socket to emulate a pipe.  Thanks to
-          Bruce Trask <BTRASK@contactsystems.com> for working to get this
-          ironed out for PharLap ETS.
-
-        * README: Added Bruce Trask to the Hall of Fame ;-)
-
-        * tests/SOCK_Connector_Test.cpp: Check for failed host lookup
-          before trying to connect.  Changed the way sethostent is done on
-          AIX 4.3 to work around an apparent bug in AIX 4.3.
-
-Tue Jun 08 13:46:38 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.h (wmain): Added a new macro to tweak the wchat_t version
-          of main program entry point to create the non-static
-          Object_Manager.  This is only enabled if UNICODE and ACE_WIN32
-          is defined (although you can also use wmain under non-UNICODE
-          environment).
-
-Mon Jun 07 14:34:53 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/CORBA_macros.h: The member function for dumping
-          TAO_Exception is changed to _tao_print_exception.
-
-Tue Jun 08 14:44:07 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Thread_Manager_Test.cpp (main): on Sun only, added 5
-          second sleep before the "main thread finished" printout.  It
-          might help (but certainly doesn't prevent) avoid an occasional
-          thread lib panic on SunOS 5.5 through 5.7.
-
-Tue Jun 08 14:01:51 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.6.41 released.
-
-Tue Jun  8 12:42:56 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * Fixed lots of brokens URL links.  Thanks to Eric S Rosenthal
-          <esr@netcom.com> for reporting these.
-
 Mon Jun  7 17:09:56 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * examples/Naming/test_multiple_contexts.cpp (main): Added a cast
-          to resolve const problems.  Thanks to David for reporting this.
+	* examples/Naming/test_multiple_contexts.cpp (main): Added a cast
+ 	  to resolve const problems.  Thanks to David for reporting this.
 
-        * examples/Naming/test_writers.cpp (main): Fixed a typo.  Thanks
-          to David for reporting this.
+	* examples/Naming/test_writers.cpp (main): Fixed a typo.  Thanks
+ 	  to David for reporting this.
 
 Mon Jun  7 14:21:48 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
 
-        * tests/DLL_Test.cpp (main): ANSI C++ spec doesnt allow void * to
-          be typecasted to a function_pointer. Hence made changes to
-          remove the warning due to this.  Thanks to Nanbor
-          <nanbor@cs.wustl.edu> for pointing it out.
+	* tests/DLL_Test.cpp (main): ANSI C++ spec doesnt allow void * to
+  	  be typecasted to a function_pointer. Hence made changes to
+	  remove the warning due to this. Thanks to Nanbor
+	  <nanbor@cs.wustl.edu> for pointing it out.
 
 Mon Jun  7 14:12:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * ACE-INSTALL.html: Added a general section explaining the order
-          of user defined macros and platform config file.  Thanks to
-          Stephen E Blake <stephen_e_blake@email.moore.com> for pointing
-          this out.
+	* ACE-INSTALL.html: Added a general section explaining the order
+	  of user defined macros and platform config file.  Thanks to
+	  Stephen E Blake <stephen_e_blake@email.moore.com> for pointing
+	  this out.
 
 Mon Jun 07 10:55:12 1999  David L. Levine  <levine@cs.wustl.edu>
 
@@ -678,8 +28,8 @@ Mon Jun 07 10:55:12 1999  David L. Levine  <levine@cs.wustl.edu>
 Mon Jun  7 12:35:17 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
 
         * examples/Service_Configurator/IPC-tests/client: Fixed some more
-          warnings related to const-correctness.  I believe that ACE is
-          now just about completely const-correct.
+ 	  warnings related to const-correctness.  I believe that ACE is
+ 	  now just about completely const-correct.
 
         * examples/Service_Configurator/Misc/main.cpp (main): Cast to
           (ASYS_TCHAR **) rather than (ASYS_THCAR *[]).  Thanks to David
@@ -1420,7 +770,7 @@ Thu May 20 09:42:54 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/OS.cpp (ftruncate): use ACE_OS::fcntl instead of ::fcntl.
 
-        Thanks to an anonymous ACE user for reporting that
+        Thanks to Joe Golio <Joe.Golio@xylan.com> for reporting that
         these functions weren't using ACE_OS::fcntl.
 
 Wed May 19 23:50:18 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 48c580bf07c..57b1c53ad3a 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.41
+    ACE VERSION: 4.6.40
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/README b/README
index 6a418d130ac..2f296b1e540 100644
--- a/README
+++ b/README
@@ -235,7 +235,6 @@ 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>
@@ -841,6 +840,7 @@ 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>
+Joe Golio <Joe.Golio@xylan.com>
 Christian Schuderer <Christian.Schuderer@erl9.siemens.de>
 John R. Taylor <jrtaylor@george.lbl.gov>
 Bill Tovrea <gwtovrea@west.raytheon.com>
@@ -859,14 +859,6 @@ 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>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson and is now at ObjectSpace.  Paul devised the recursive
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/ChangeLog-99c b/TAO/ChangeLog-99c
index 65f6d4bb43d..7fffccace4c 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,1936 +1,146 @@
-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.
-
-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.
-
-Wed Jun 16 01:12:55 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* 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.
-
-	* 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.
-	
-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/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...
-
-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
-
-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.
+Wed Jun 16 13:00:59 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_operation/operation_ami_ch.cpp:
+	* TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp:
+	* TAO_IDL/be_include/be_visitor_operation/operation_ami_ch.h:
+	* TAO_IDL/be_include/be_visitor_operation/operation_ami_cs.h:
+
+	Added these files.
+
+	* TAO_IDL/be/be_visitor_operation/operation_ami.cpp:
+	Removed this file.		
+
+	* TAO_IDL/Makefile:
+	* TAO_IDL/be/be_visitor_factory.cpp:
+	* TAO_IDL/be/be_visitor_operation.cpp:
+	* TAO_IDL/ be/be_visitor_interface/interface.cpp:
+	* TAO_IDL/ be/be_visitor_operation/rettype_return_cs.cpp:
+	* TAO_IDL/ be_include/be_codegen.h:
+	* TAO_IDL/ be_include/be_visitor_operation.h:
+	* TAO_IDL/driver/drv_args.cpp:
+	Changes for generating AMI Call back code in *C.cpp. But sendc_
+	methods still have code that we have for synchronous invocations.  
+
+
+Tue Jun 15 13:25:16 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.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_ci.cpp:
+	* TAO_IDL/be/be_visitor_operation/argument.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/driver/drv_args.cpp:
+	* TAO_IDL/include/idl_global.h:
+	* TAO_IDL/util/utl_global.cpp:
+
+	* TAO_IDL/L/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:
+
+	Completed generating .i file contents for the AMI_<Interface
+	Name>_Handler interface. 
+
+	Introduced an option -MC to generate Call back features.
 
-Tue Jun 15 17:44:45 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-	* 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.
-
-	  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.
-
-	* 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.
+	
+Fri Jun 11 22:32:46 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	Generated AMI_<interface_name>_Handler_{var, out, ptr} class
+	definitions in the ch file.
+
+	* 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_interface_fwd.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+	* TAO_IDL/be/be_visitor_operation/arglist.cpp:
+	* TAO_IDL/ TAO_IDL/ be_include/be_codegen.h::
+	* TAO_IDL/be_include/be_interface.h:
+	* TAO_IDL/be_include/be_visitor_interface.h:
+	* TAO_IDL/be_include/be_visitor_interface_fwd.h:
+	* TAO_IDL/ be_include/be_visitor_interface/interface_ch.h:
+	Changes for the above.
+
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h:
+	* TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h:
+	* TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp:
+	* TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp:
+	Added these files.
+
+Thu Jun 10 13:05:17 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* TAO_IDL/be/be_visitor_operation/arglist_ami.h:
+	* TAO_IDL/be/be_visitor_operation/arglist_ami.cpp:
+	Updated the files to generate parameters for all the different
+	types. 
+	* TAO_IDL/Makefile:
+	Updated the dependencies. 		
+
+
+Wed Jun  9 19:19:43 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
+
+	* TAO_IDL/be_include/be_codegen.h
+	* TAO_IDL/be_include/be_visitor_argument.h
+	* TAO_IDL/be_include/be_visitor_operation.h
+	* TAO_IDL/be_include/be_codegen.h: 
+	* TAO_IDL/be/be_visitor_interface/interface.cpp
+	* TAO_IDL/be/be_visitor_operation/argument.cpp
+	* TAO_IDL/be/Makefile.am
+	* TAO_IDL/be/be_visitor_argument.cpp
+	* TAO_IDL/be/be_visitor_factory.cpp
+	* TAO_IDL/be/be_visitor_operation.cpp	
+			
+	First step on generating AMI stubs for operations. Just generating
+	"sendc_<operation_name>" for all the operations.  
+
+ 	* TAO_IDL/be/be_visitor_argument/arglist_ami.cpp
+ 	* TAO_IDL/be/be_visitor_operation/arglist_ami.cpp
+ 	* TAO_IDL/be/be_visitor_operation/operation_ami.cpp
+ 	* TAO_IDL/be_include/be_visitor_argument/arglist_ami.h
+ 	* TAO_IDL/be_include/be_visitor_operation/operation_ami.h
+ 	* TAO_IDL/be_include/be_visitor_operation/arglist_ami.h
+
+	Added these files.
 
-Tue Jun 15 16:42:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+Mon Jun  7 16:13:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* 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.
-
-	  (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.
-
-	* 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_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.
-
-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.
-
-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.
-
-	* 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.
-
-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/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.
-
-Tue Jun 15 10:57:08 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* 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.
-
-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!
-
-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.
-
-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/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/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.
-
-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.
-
-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!
-
-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.
-
-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.
-
-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.
-
-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.
-
-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.
-
-	* 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:
-
-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.
-
-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.
-
-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.
-
-        * tao/Object_KeyC.h: TAO_ObjectKey_var needs to be exported on
-          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.
-
-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.
-
-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!)
-
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp:
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
-          Minor cosmetic fixes.
-
-Mon Jun 14 09:58:47 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO-INSTALL.html: Updated Barry Hoggard's CORBA page URL.
-
-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
-
-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.
-
-          (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.
-
-        * 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.
-
-        * 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.
-
-        * 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.
-
-          (set_default_poa): Added the method to both Cubit_Factory and
-          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.
-
-        * 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.
-
-        * 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.
-
-          *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.
-
-        * tao/Object_Adapter.h (Servant_Upcall): Added TAO_Export to this
-          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.
-
-        * 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.
-
-        * tao/GIOP.h (TAO_GIOP_Message_State): Added TAO_Export to the
-          class TAO_GIOP_Message_State.
-
-Sun Jun 13 23:38:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        Quest for TAO try macros free TAO:
-
-        * tao/deep_copy.cpp:
-        * 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.
-
-        * tao/Marshal.cpp (make_marshal_object): Changed to use ACE try
-          macros.
-
-        * tao/Exception.cpp (item): Replaced TAO_IN_ENV with ACE_TRY_ENV
-          and commented out ACE_TRY_ENV.clear () since we shouldn't depend
-          on clearing up the environment to make it works correctly.
-
-Sun Jun 13 23:29:22 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Transient_Naming_Context.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.{h,cpp}: Added the
-          above files.
-
-        * orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.{h,cpp}:
-          Removed the above files.
-
-        * orbsvcs/orbsvcs/Naming/Naming_Context.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Entries.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Entries.{h,cpp}:
-          Modified the above files.  Restructured the implementation of
-          NamingContext to factor out the common code between persistent
-          and nonpersistent implementations through the Template method
-          pattern (added TAO_Transient_Naming_Context, TAO_Bindings_Map,
-          TAO_Transient_Bindings_Map classes and modified others).  Made
-          TAO_Persistent_Context_Index a non-template class, and
-          TAO_Bindings_Iterator a template class.  Made a pass through
-          some files for code review - added comments.  Got rid of the use
-          of <create_servant_lock> method, and changed lock pointers to
-          lock references.  Many other minor adjustments...
-
-Sun Jun 13 22:39:51 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h,
-        * orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h,
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h,
-        * orbsvcs/orbsvcs/Event/EC_Gateway.h,
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.h: Added default
-          TAO_default_environment() calls.  Thank to Russ Noseworthy for
-          reporting this.
-
-Sun Jun 13 21:46:25 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/NestedUpcall/Triangle_Test/run_test.pl:
-        * tests/NestedUpcall/MT_Client_Test/run_test.pl:
-          More scripts changed to use timeouts.
-
-        * tests/MT_Client/test.idl:
-        * tests/MT_Client/test_i.cpp:
-        * tests/MT_Client/test_i.h:
-        * tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp:
-        * tests/NestedUpcall/MT_Client_Test/MT_Object_i.h:
-        * tests/NestedUpcall/Reactor/Reactor.idl:
-        * tests/NestedUpcall/Reactor/eh_i.cpp:
-        * tests/NestedUpcall/Reactor/eh_i.h:
-        * tests/NestedUpcall/Reactor/reactor_i.cpp:
-        * tests/NestedUpcall/Reactor/reactor_i.h:
-        * tests/NestedUpcall/Triangle_Test/Initiator_i.cpp:
-        * tests/NestedUpcall/Triangle_Test/Initiator_i.h:
-        * tests/NestedUpcall/Triangle_Test/Object_A_i.cpp:
-        * tests/NestedUpcall/Triangle_Test/Object_A_i.h:
-        * tests/NestedUpcall/Triangle_Test/Object_B_i.cpp:
-        * tests/NestedUpcall/Triangle_Test/Object_B_i.h:
-        * tests/Param_Test/param_test_i.cpp:
-        * tests/Param_Test/param_test_i.h:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h:
-        * performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/Event_Service/Event_Service.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.h:
-          More throw specs added
-
-Sun Jun 13 16:18:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/releasenotes/orbcore.html:
-          Documented the GIOP 1.1 implementation.
-
-        * docs/releasenotes/TODO.html:
-          Made a pass marking the completed tasks as such
-
-Sun Jun 13 15:35:42 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time/TAO_TIO.cpp:
-        * orbsvcs/orbsvcs/Time/TAO_TIO.h:
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp:
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h:
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp:
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h:
-        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp:
-        * orbsvcs/orbsvcs/Time/TAO_UTO.h:
-          More throw specs fixed.
-
-Sat Jun 12 21:56:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/index.html:
-        * docs/Tags.html:
-          A new document that describes how TAO uses tags and other magic
-          numbers.
-
-Sat Jun 12 20:29:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-          Documented the tags obtained from the OMG.
-
-        * tao/ORB.cpp:
-          Improve debugging messages
-
-        * tao/GIOP.h:
-          Use an OMG assigned profile ID for the unix domain sockets
-
-        * examples/POA/Default_Servant/File_i.cpp:
-          Create the files in 644 mode, so we can write on them!
-
-        * examples/POA/Default_Servant/run_test.pl:
-        * tests/MT_Client/run_test.pl:
-        * tests/NestedUpcall/Reactor/run_test.pl:
-          Use the new timed routines to drive this test.
-
-        * orbsvcs/tests/Simple_Naming/run_test.pl:
-          Minor revision to the multithreaded test
-
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
-        * tao/DomainC.cpp:
-        * tao/Invocation.cpp:
-        * tao/MessagingC.cpp:
-        * tao/Object.cpp:
-        * tao/POAC.cpp:
-        * tao/PolicyC.cpp:
-        * tao/PollableC.cpp:
-          The right exception to raise if the stubobj is nil() is
-          CORBA::INTERNAL
-
-Sat Jun 12 19:51:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
-        * orbsvcs/orbsvcs/Runtime_Scheduler.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/Persistent_Naming_Context.cpp:
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h:
-        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
-        * orbsvcs/orbsvcs/Sched/Config_Scheduler.h:
-        * orbsvcs/tests/EC_Basic/EC_Basic.cpp:
-        * orbsvcs/tests/EC_Basic/EC_Basic.h:
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.h:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.h:
-        * orbsvcs/tests/Event/lib/Consumer.cpp:
-        * orbsvcs/tests/Event/lib/Consumer.h:
-        * orbsvcs/tests/Event/lib/Supplier.cpp:
-        * orbsvcs/tests/Event/lib/Supplier.h:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.h:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h:
-          More throw spec fixes
-
-Sat Jun 12 18:42:04 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Channel_Clients_T.cpp:
-        * orbsvcs/orbsvcs/Channel_Clients_T.h:
-        * orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp:
-        * orbsvcs/orbsvcs/Concurrency/CC_LockSet.h:
-        * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp:
-        * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Gateway.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_UDP_Admin.h:
-        * orbsvcs/orbsvcs/Event/Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/Event_Channel.i:
-          Fixed throw specifications for all the event channel and
-          concurrency service files.
-
-Sat Jun 12 18:08:49 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/GIOP.i:
-          Fixed buffer managment bug, the incoming buffer on each
-          (server) transport was re-used for the next call, but we cannot
-          do that because the buffer may be in use by some octet
-          sequences.
-
-        * tao/GIOP.cpp:
-          More initializations to keep purify happy
-
-        * tao/ORB.cpp:
-          Removed UMR warning on purify by initializing a CDR buffer with
-          0's  The warning was due to padding bytes, it was not harmful,
-          but it could hide real problems.
-
-        * utils/nslist/nslist.cpp:
-          Improved output
-
-        * orbsvcs/tests/Simple_Naming/run_test.pl:
-          Use a file to communicate the IOR back to the client, is more
-          reliable.
-          Several improvements in the subprocess managment.
-
-Sat Jun 12 14:28:20 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * TAO_IDL/be/be_union.cpp:
-          TAO_IDL/be_include/be_union.h: Removed the cast to long for the
-          case when the union member is of type boolean. We handled this
-          by making the blval union member as a long.
-
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
-          TAO_IDL/be/be_visitor_union_branch/public_ch.cpp: We were not
-          handling the code generation of union defined inside a structure
-          or another union.
-
-        * TAO_IDL/be/be_visitor_field/field_ci.cpp: Cosmetic changes.
-
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: Fixed
-          indentation problem in generated code.
-
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-          TAO_IDL/be/be_visitor_operation/argument.cpp:
-          TAO_IDL/be_include/be_visitor_operation/arglist.h:
-          TAO_IDL/be_include/be_visitor_operation/argument.h: These
-          operation visitors now inherit from the be_operation visitor so
-          that we can use the base operations defined on the base class
-          operation visitor. Additional changes are described below.
-
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-          TAO_IDL/be/be_visitor_operation/argument.cpp:
-          TAO_IDL/be/be_visitor_operation/collocated_ss.cpp:
-          TAO_IDL/be/be_visitor_operation/operation.cpp:
-          TAO_IDL/be_include/be_visitor_operation/operation.h:
-          TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
-          TAO_IDL/be/be_visitor_operation/operation_ih.cpp:
-          TAO_IDL/be_include/be_visitor_operation/operation_ih.h:
-          TAO_IDL/be/be_visitor_operation/operation_is.cpp:
-          TAO_IDL/be_include/be_visitor_operation/operation_is.h:
-          TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
-          TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-          TAO_IDL/be/be_visitor_operation/tie_si.cpp: Generated
-          stubs/skeletons now support real C++ exceptions as specified by
-          the IDL->C++ mapping. We also generate the ACE_THROW_SPEC macro
-          for the stubs and skeletons. To support this, some common code
-          was factored out and put into the base operation visitor. Users
-          will need to use the -Ge option to the IDL compiler to enable
-          support for C++ exceptions.
-
-        * docs/releasenotes/index.html:
-          docs/compiler.html: Updated documentation.
-
-Fri Jun 11 20:36:37 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/TIE/run_test.pl: Changed the way the client process
-          was launched. Initial a system call was used. But now we are
-          using a Process::Create call to do that.
-
-Fri Jun 11 20:04:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: Removed
-          obsolete options
-
-Fri Jun 11 19:26:30 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/TIE/server.cpp (main): Fixed a small problem on
-          NT. It was not writing the IOR to a file. It was fixed.
-
-        * examples/POA/TIE/run_test.pl: Made a change to be on par with
-          Carlos's latest standard.
-
-        * examples/POA/TIE/run_test.pl: Added a new file.
-
-        * examples/POA/TIE/server.cpp : To facilitate usage of a perl
-          script for running the test, made the server to ior to a file.
-
-        * examples/POA/TIE/client.cpp: To facilitate reading the ior by
-          the perl script, change was made to read the ior from the
-          command line in "file://" format .
-
-Fri Jun 11 19:08:45 1999  John Heitmann  <jwh1@cs.wustl.edu>
-
-        * TAO/examples/POA/DSI/run_test.pl:
-        * TAO/examples/POA/Default_Servant/run_test.pl:
-        * TAO/examples/POA/Explicit_Activation/run_test.pl:
-        * TAO/examples/POA/FindPOA/run_test.pl:
-        * TAO/examples/POA/Forwarding/run_test.pl:
-        * TAO/examples/POA/Loader/run_test.pl:
-        * TAO/examples/POA/NewPOA/run_test.pl:
-        * TAO/examples/POA/On_Demand_Activation/run_test.pl:
-        * TAO/examples/POA/On_Demand_Loading/run_test.pl:
-        * TAO/examples/POA/Adapter_Activator/run_test.pl:
-        * TAO/examples/POA/Reference_Counted_Servant/run_test.pl: Changed
-          all instances where a test would wait forever to waits which
-          time out after a period of time.
-
-Fri Jun 11 18:33:21 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/server.cpp: Added a const to avoid a SunC++
-          "string literal to char*" warning.
-
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp: Various
-          changes to avoid SunC++ 5.0's "string literal to char*"
-          warnings.
-
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
-          Various maneuvers to avoid SunC++ 5.0 "string literal to char*"
-          warnings.
-
-        * TAO/tests/DynAny_Test/data.h: Added a 'const' to get rid of
-          SunC++ warnings.
-
-        * TAO/tests/Param_Test/run_test.pl: Added an unlink $iorfile at
-          the beginning so the client won't get the wrong IOR if the file
-          already exists. This was causing the first test to show
-          CORBA::TRANSIENT exceptions on NT. Thanks to Carlos for
-          suggesting a better fix than the one I had.
-
-Fri Jun 11 12:27:29 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp.diff: Updated the diff output to handle
-          the new flex output from idl.ll.
-
-        * TAO_IDL/fe/idl.ll: Made the following two changes to TAO's IDL
-          flex file.
-
-          Removed the "A" through "Z" characters ranges.  Under EBCDIC
-          the need to be "A through I", "J through R", and "S through Z"
-          (ditto for the lower case letters).  Perhaps it should just be
-          changed to be "[ABCDEFGHIJKLMNOPQRSTUVWXYZ]"...
-
-          Added support for the trigraph "??=" which is the trigraph for
-          the "#" sign.  The OpenEdition preprocessor inserts a "pragma"
-          statement at the start of the preprocessed output using this
-          trigraph.
-
-          Thanks to Jim Rogers <jrogers@viasoft.com> for these fixes.
-
-Fri Jun 11 14:48:11 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl,
-          performance-tests/Cubit/TAO/MT_Cubit/run_test.pl:
-          updated to use Carlos' timeouts.  Cool!
-
-Fri Jun 11 14:33:27 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/DynAny_Test/test_dynenum.cpp: Changed test code to
-          match the change in enum labels made in the IDL file a while
-          back.
-
-Fri Jun 11 14:17:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/include/be_extern.h: Changed several extern "C"
-          functions to plain extern. They were actually compiled with C++
-          and was giving warnings under Sun/CC 5.0 (and errors in other
-          platforms).
-
-        * tests/MT_Client/run_test.pl:
-        * examples/POA/Forwarding/run_test.pl: Modified to use the new
-          timeouts, just an example for other test developers.
-
-        * orbsvcs/tests/Simple_Naming/run_test.pl: It was missing the
-          ACEutils package. Updated to use the process timeouts.
-
-Fri Jun 11 11:42:07 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/DynAny_Test/test_wrapper.cpp: Added #include "ace/OS.h" so
-          that they compile on aCC compiler on HP_UX
-
-Thu Jun 10 23:17:38 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_enum.h:
-        * TAO_IDL/be/be_enum.cpp: Added a method to convert a numerical
-          value to an enum's string name for it. When generating code for
-          the _default() method for a union, if the discriminator is an
-          enum, some compilers (MSVC among them) will complain about
-          assigning a numeric constant to the discriminator in
-          _default(). This method and the changes below enable the
-          assignment of the enum label identifier instead.
-
-        * TAO_IDL/be/be_visitor_union/union_ci.cpp:
-        * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp: Moved
-          generation of code for the _default() method from the union
-          visitor to the discriminant visitor, so it would be a little
-          easier to get at the enum labels. Thanks to Kristopher Johnson
-          <kjohnson@gardnersys.com> for pointing out the problem and
-          supplying an IDL file for a test case.
-
-Thu Jun 10 23:10:23 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/UIOP_Profile.cpp: Fixed bug in UIOP_Profile enconding.
-
-Thu Jun 10 21:32:59 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp: Added the new files
-
-Thu Jun 10 21:20:19 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Tagged_Components.h:
-        * tao/Tagged_Components.i:
-        * tao/Tagged_Components.cpp: New class to manipulate and query
-          tagged components efficiently.
-
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.i:
-        * tao/IIOP_Profile.cpp:
-        * tao/IIOP_Acceptor.cpp:
-        * tao/UIOP_Profile.h:
-        * tao/UIOP_Profile.i:
-        * tao/UIOP_Profile.cpp:
-        * tao/UIOP_Acceptor.cpp: The IIOP and UIOP profiles use the
-          TAO_Tagged_Components class to implement the tagged_components
-          field in GIOP/IIOP 1.1 The Acceptors generate the standard
-          IOP::TAG_ORB_TYPE and IOP
-
-        * tao/iopfwd.h:
-        * tao/MessagingC.h: Removed "tao/iopfwd.h" the contents are in
-          IOPC.h
-
-        * tao/corbafwd.h: Added several magic numbers that we use for the
-          tagged components and the codeset support, I tried to describe
-          the source for each one.
-
-        * tao/ORB.cpp: Fixed demarshaling of TC_opaque (again!)
-
-        * tao/CONV_FRAME.pidl:
-        * tao/CONV_FRAMEC.cpp:
-        * tao/CONV_FRAMEC.h:
-        * tao/CONV_FRAMEC.i:
-        * tao/CONV_FRAMES.cpp:
-        * tao/CONV_FRAMES.h:
-        * tao/CONV_FRAMES.i:
-        * tao/CONV_FRAMES_T.cpp:
-        * tao/CONV_FRAMES_T.h:
-        * tao/CONV_FRAMES_T.i: Implement the the CONV_FRAME module in
-          CORBA 2.2, it is just a bunch of types, no interfaces.
-
-        * tao/IOPC.h:
-        * tao/IOPC.i:
-        * tao/IOPC.cpp:
-        * tao/IOPS.h:
-        * tao/IOPS.i:
-        * tao/IOPS.cpp:
-        * tao/IOPS_T.h:
-        * tao/IOPS_T.i:
-        * tao/IOPS_T.cpp: Added the complete (as of CORBA 2.2) IOP module
-          definition.
-
-        * tao/Makefile: Added the new files.
-
-        * tao/orbconf.h:
-        * tao/ORB_Core.cpp:
-        * tao/params.h:
-        * tao/params.i:
-        * tao/params.cpp: New option (-ORBStdProfileComponents 0/1) to
-          control the generation of the standard tagged components on each
-          profile. They are optional, i.e. we are not required to generate
-          them, and take some space (in the IORs). Notice that they do
-          *not* affect the critical path (unless you are sending a lot of
-          object references).
-
-        * docs/Options.html: Documented the new -ORBStdProfileComponents
-          option
-
-        * utils/catior/catior.cpp: Added support for GIOP 1.1 tagged
-          components in both IIOP and UIOP profiles
-
-        * tao/GIOP.cpp: Removed unused variable
-
-        * tao/orbconf.h:
-        * tao/corbafwd.h:
-        * tao/ORB.h:
-        * tao/Exception.h:
-        * tao/Exception.cpp: Removed the last use of TAO_CONST
-
-        * TAO_IDL/driver/drv_args.cpp: If the temporary directory cannot
-          be open we print an Error, not a Warning (it would be confusing
-          otherwise). Thanks to Jim Rogers <jrogers@viasoft.com> for
-          pointing this out.
-
-Thu Jun 10 17:15:37 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Exception.cpp: Added include and modified identifier related
-          to the codeset translator implemented for IBM1047. Thanks to Jim
-          Rogers <jrogers@viasoft.com> for pointing this out.
-
-Thu Jun 10 16:51:02 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * examples/Simple/chat/Server_i.h:
-        * orbsvcs/orbsvcs/CosEvent_Utilities.cpp: fixed sunc++ 5.0 warning
-          for initializing a non const char* with a string literal.
-
-Thu Jun 10 15:24:21 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp: Added the inclusion of ace/Object_Manager.h
-          because of the use of ACE_Static_Object_Lock.  Thanks to
-          J. Russell Noseworthy <rnosewor@objectsciences.com> for
-          reporting this.
-
-Thu Jun 10 15:27:39 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/Callback_Quoter/Consumer_Handler.h (class
-          Consumer_Handler): Made the stock_name_ member const char* from
-          char* to take care of Sun C++ 5.0 compiler warnings.
-
-Thu Jun 10 14:54:30 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
-        * TAO_DIL/be/be_visitor_sequence/sequence_cs.cpp : Fix for scoped
-          names on NT. NT does not accept scoped names in header files.
-
-Thu Jun 10 14:19:02 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/POA/On_Demand_Loading/Server_Manager.cpp (create_poa):
-          Removed typecast warning and changed the return value to 0 from
-          -1.
-
-        * examples/POA/On_Demand_Loading/README: Explicitly mentioned that
-          by default Generic_Servant is used and hence needs to be built
-          before running this example using run_test.pl.
-
-Thu Jun 10 14:13:19 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
-          be_visitor_typedef_ch::visit_array() had numerous problems, such
-          as the generation of "static" where "ACE_INLINE" should have
-          been in a couple of places, and multiple calls from the same
-          be_typedef object to nested_type_name() in the same stream
-          output statement.  This generates incorrect code because
-          nested_type_name() contains static buffers, and the order of
-          evaluations within a chained stream output statement is not
-          guaranteed, only the order of output. Thanks to Carlos for
-          explaining why my fix to this last worked, and to Schuderer
-          Christian <Christian.Schuderer@erl9.siemens.de> for supplying
-          the IDL file that caused the problem.
-
-Thu Jun 10 13:53:09 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/Simple/Simple_util.cpp: Fixed improper use of return
-          values from the ORB Manager.  Since the ORB Manager duplicates
-          the data members before returning them, we must store them in
-          vars.
-
-        * examples/Simple/chat/Client_i.cpp (run): Changed the use of ORB
-          to ORB Manager to simplify the activatation of the POA Manager.
-          The POA Manager must be activated before incoming calls can
-          reach the servants registered with the POAs that the POA Manager
-          manages.  Thanks to Bill Tovrea <gwtovrea@west.raytheon.com> for
-          pointing out this problem.
-
-Thu Jun 10 13:18:31 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Request.h: Inline functions must be included *before*
-          RequestSeq to avoid inline functions being used before declared
-          inline warnings.
-
-        * tao/Request.{i,cpp} (release): Re-inlined release method.
-
-Thu Jun 10 13:03:14 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/IIOP_Connect.cpp (handle_input): Must return from
-          handle_input if TAO_GIOP::handle_input() returns -1.
-
-        * tao/ORB_Core.cpp: Added inclusion of POA.h since I removed it
-          from default_resources.h.
-
-        * tao/default_resource.cpp (init): Removed the -ORBPOA option.
-          Code for parsing this option was still there but this option has
-          not been used in a long time.  Thanks to Phil Mesnier
-          <mesnier_p@ociweb.com> for reporting this.
-
-        * tao/default_server.cpp (TAO_Default_Server_Strategy_Factory):
-          Removed <poa_mgr_lock_type_>.  It is no longer used.  Also, in
-          parse_args(), changed -ORBEventLock to -ORBEventLoopLock and
-          fixed the code associated with its parsing (previously it was
-          setting <poa_mgr_lock_type_>, yikes!).
-
-          Note that -ORBEventLoopLock should probably remain undocumented
-          for now since its utility is still in question and the default
-          of null lock seems reasonable in many cases.
-
-Thu Jun 10 11:07:30 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Param_Test/tmplinst.cpp: Fixed #pragma instantiations.
-
-        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: Fixed a problem
-          in NT. Thanks to Chris & Andy for pointing this out.
-
-Thu Jun 10 09:41:06 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/Sequence_T.{i, cpp}: Fixed incorrect number of parameters
-          passed to templates.
-
-Thu Jun 10 08:12:14 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/MessageC.cpp: There were serveral instances where the
-          CORBA::Environment parameter was declared as "env", but we were
-          using the ACE_THROW_* macros which need the ACE_TRY_ENV
-          variable. This is now fixed.
-
-        * tao/Pluggable.cpp (start_request, start_locate): The header file
-          was using ACE_THROW_SPEC to indicate all possible exceptions
-          these operations can throw. The *.cpp file was, however, using
-          the TAO_THROW_SPEC macro which is a NO-OP and will soon be
-          deprecated. With exceptions enabled, the compiler was giving
-          errors. We now use ACE_THROW_SPEC.
-
-Wed Jun 09 23:16:21 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/orbconf.h: Without Minimum CORBA, the user will get regular
-          (no locality constraints) policies by default.  With Minimum
-          CORBA, the user will get locality constraint policies by
-          default.
-
-          If #define TAO_HAS_REMOTE_POLICIES 0, then the user will always
-          get locality constraint policies (regardless of Minimum CORBA).
-
-          If #define TAO_HAS_REMOTE_POLICIES 1, then the user will always
-          get regular policies (regardless of Minimum CORBA).
-
-          Thanks to Nanbor for helping with this.
-
-        * tao/Servant_Base.cpp (_dispatch): Added a non-op, exception
-          throwing _dispatch().
-
-        * tao/Servant_Base.h: TAO_Local_ServantBase should virtually
-          inherit from TAO_ServantBase.
-
-        * tao/POAS:
-        * tao/DynAnyS:
-        * tao/Current: Removed the _dispatch() method from all locality
-          constraint classes.  Also for the policy classes, moved the
-          _dispatch() method into the TAO_HAS_LOCALITY_CONSTRAINT_POLICIES
-          defines.
-
-        * tao/Policy: Made the Policy stub and skeleton classes aware of
-          TAO_HAS_LOCALITY_CONSTRAINT_POLICIES, and moved the extra
-          methods not required for locality constraint policies under the
-          TAO_HAS_LOCALITY_CONSTRAINT_POLICIES #defines.
-
-        * tao/Messaging_Policy_i (RelativeRoundtripTimeoutPolicy): Made
-          inheritance virtual and removed extra copy constructor.
-
-        * tao/MessagingC (all policies): Since the policies are locality
-          constrained, we can make the stub methods pure virtual and make
-          sure that the _narrow method does not create the stub class.
-
-        * tao/POA.h (all policies): Removed unnecessary copy constructors.
-
-        * tao/POA_CORBA: Made the CORBA::Current, PolicyManager, and
-          PolicyCurrent classes locality constrained to match the spec.
-
-Wed Jun  9 22:18:10 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Sequence_T.cpp
-        * tao/Sequence_T.h
-        * tao/Sequence_T.i: Added an operator= (T_var) in
-          TAO_Object_Manager class. This was achieved by adding an extra
-          parameter to the template. This necessiateted that the classes
-          TAO_Unbounded_Object_Sequence, TAO_Bounded_Object_Sequence,
-          TAO_Pseudo_Unbounded_Object_Sequence,TAO_Bounded_Pseudo_Sequence
-          had to be changed. An extra template parameter was added in
-          these classes also.
-
-        * tao/DomainC.cpp
-        * tao/DomainC.h
-        * tao/DomainC.i
-        * tao/PolicyC.cpp
-        * tao/PolicyC.h
-        * tao/PolicyC.i
-        * tao/Request.cpp
-        * tao/Request.h
-        * tao/corbafwd.h: The changes in these files were done to reflect
-          the changes that were made in the classes above.  They had to be
-          done keep in sync with the new template class declarations.
-
-        * TAO_IDL/be/be_visitor_sequence/elemtype.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/sequence_base.cpp
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
-        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
-        * TAO_IDL/be_include/be_visitor_sequence/sequence_base.h: Changes
-          to the IDL compiler to reflect the above change that was
-          made. Thanks to Jake Hamby <jehamby@anobject.com> for pointing
-          out the need for the assignment operator and also in helping us
-          out with a sample solution.
-
-Wed Jun  9 21:13:00 1999  Chris Gill <cdgill@cs.wustl.edu>
-
-        * examples/Simulator/DOVEMIB/clnt.h: moved CORBA::ORB_var
-          member declaration first in the class.
-
-Wed Jun  9 20:16:36 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Started the work on GIOP 1.1, the current version is still
-          incomplete, but works and has to be tested in more
-          platforms. The features implemented so far include:
-          + Requests are issued using version 1.1 or version 1.0,
-            depending on the version of the profile.
-          + Acceptors create v 1.1 profiles by default, but can generate
-            1.0 profiles if a -ORBendpoint option with an explicit version
-            is present (like -ORBendpoint iiop://1.0@host:0)
-          + Replys are sent using the same version that the request
-          + There is a framework to receive a request (or reply) broken in
-            multiple fragments.  The framework is not specially efficient,
-            is does not handle fragments with different byte order or
-            different GIOP versions and is completely untested. TAO does
-            *not* generate fragments.
-          + Notice that the tagged components in the profile are *not*
-            implemented yet.
-
-        * tao/orbconf.h:
-          Added new macros to control the default GIOP protocol version,
-          either 1.0 or 1.1
-
-        * tao/Acceptor_Registry.cpp:
-          Use the version in the command-line endpoint to initialize the
-          Acceptor.
-
-        * tao/Environment.h:
-          Cosmetic fixes
-
-        * tao/GIOP.h:
-        * tao/GIOP.i:
-        * tao/GIOP.cpp:
-          Many changes to support 1.1, including a new class to keep the
-          state of an incoming message composed by multiple fragments.
-
-        * tao/Server_Request.h:
-        * tao/GIOP_Server_Request.h:
-        * tao/GIOP_Server_Request.cpp:
-          The server request uses the version of the request to determine
-          the version of the reply.
-          We don't need to use exceptions in the constructor, saving us
-          from some really nasty portability problems.
-
-        * tao/Invocation.h:
-        * tao/Invocation.i:
-        * tao/Invocation.cpp:
-          Moved the code to initialize a Request or LocateRequest message
-          to the transport classes, not only this isolates the use of
-          TAO_GIOP even further, it is also needed because the transport
-          class needs to query the version of the Profile to determine the
-          version of the GIOP message.
-
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-          Added the Service Context List to the ORB core, it lacks an
-          elegant interface, but at least it can be set and is used.
-
-        * tao/Reply_Dispatcher.h:
-        * tao/Reply_Dispatcher.cpp:
-        * tao/Transport_Mux_Strategy.h:
-        * tao/Transport_Mux_Strategy.cpp:
-          Changed the interfaces in the the ORB core to use a
-          TAO_GIOP_Message_State that keeps track of not only the payload,
-          but of any fragments for the current message, the current amount
-          of data read on the fragment, etc.
-
-        * tao/Pluggable.h:
-        * tao/Pluggable.i:
-        * tao/Pluggable.cpp:
-        * tao/IIOP_Acceptor.h:
-        * tao/IIOP_Acceptor.cpp:
-        * tao/IIOP_Connect.h:
-        * tao/IIOP_Connect.cpp:
-        * tao/IIOP_Factory.h:
-        * tao/IIOP_Factory.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.i:
-        * tao/IIOP_Profile.cpp:
-        * tao/IIOP_Transport.h:
-        * tao/IIOP_Transport.cpp:
-        * tao/UIOP_Acceptor.h:
-        * tao/UIOP_Acceptor.cpp:
-        * tao/UIOP_Connect.h:
-        * tao/UIOP_Connect.cpp:
-        * tao/UIOP_Factory.h:
-        * tao/UIOP_Factory.cpp:
-        * tao/UIOP_Profile.h:
-        * tao/UIOP_Profile.i:
-        * tao/UIOP_Profile.cpp:
-        * tao/UIOP_Transport.h:
-        * tao/UIOP_Transport.cpp:
-          All the classes where change to propagate the GIOP version of
-          the message and the profile used for each request.
-
-        * orbsvcs/tests/Simple_Naming/client.cpp:
-          Use CORBA::is_nil() to validate object references
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.h:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-          Updated to use the new TAO IIOP_Profile constructor
-
-        * utils/catior/catior.cpp:
-          TAO moved to GIOP 1.1, but this test can only handle GIOP 1.0
-
-        * utils/nslist/nslist.cpp:
-        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
-          Fixed use of String_var and managed types must passed using
-          .in() to ACE_DEBUG()
-
-        * orbsvcs/tests/Trading/Makefile:
-        * examples/POA/Generic_Servant/Makefile:
-          Define PSRC so the dependencies for the program files
-          are also generated.
-
-Wed Jun  9 17:16:44 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/run_test.pl:
-        Made the output from print statements go to STDERR.
-
-Wed Jun  9 17:07:49 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/NestedUpcall/Reactor/run_test.pl:
-          Improved test output
-
-        * examples/POA/Generic_Servant/Makefile:
-          Updated dependencies
-
-Wed Jun  9 16:58:47 1999  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp: Added the
-          explicit template specialization macro,
-          ACE_TEMPLATE_SPECIALIZATION, to make SunC++ 5.0 happy.  Thanks
-          to Carlos for explaining how to add this.
-
-Wed Jun 09 16:42:03 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp (compute_scheduling):
-          changed type of anomaly_severity_msg from char * to const char
-          *, to avoid warnings from Sun C++ 5.0 about string literal
-          conversion.  Thanks to Doug for reporting this.  Also, removed
-          and changed a few casts to ANSI-style casts.
-
-Wed Jun  9 16:26:55 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.cpp: Changed >>= (to_object) to reflect
-          the change in CORBA 2.3 - namely that the caller is responsible
-          for release of the result of this call. Thanks to
-          Doug Anderson <doug@clark.net> for pointing this out.
-
-Wed Jun 09 16:03:12 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/Default_Servant/client.cpp
-        * examples/POA/Forwarding/server.cpp
-        * examples/POA/On_Demand_Activation/server.cpp
-        * examples/POA/RootPOA/RootPOA.cpp
-        * examples/POA/TIE/server.cpp: Simple clean up.  Also fixed one
-          memory leak.
-
-        * tao/default_resource.cpp (init): -ORBReactorType handling and
-          selection of Reactor was incorrect.  Correct behavior is that
-          "null" should select TAO_REACTOR_SELECT_ST and "token" should
-          select TAO_REACTOR_SELECT_MT.  Thanks to Phil Mesnier
-          <mesnier_p@ociweb.com> for reporting this bug.
-
-Wed Jun  9 13:43:18 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO_IDL/fe: Regenerated the y.tab.cpp file with the new BYACC so
-          that we won't have any more annoying warnings about cons
-        t
-          correctness.
-
-        * utils/nslist: Added a new utility program that prints out a
-          nicely organized list of Naming Contexts in a Naming Service.
-          Thanks to Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov> for
-          contributing this.
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_pre_proc): Fixed a bug that
-          was preventing the IDL compiler from putting files in the
-          current directory.  Thanks to Byron Harris for reporting this.
-
-Tue Jun 08 21:13:36 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/IIOP_Profile.cpp (set): Removed the use of
-          TAO_ORB_Core_instance() in this method.  The use of this
-          function was incorrect since each ORB has its own set of orb
-          parameters and we should only look at our own ORB's parameters.
-
-        * tao/IIOP_Profile: Removed extra and unused constructors
-          (again).  Also, added extra ORB Core argument to remaining
-          constructors.
-
-        * tao/IIOP_Profile.h (TAO_IIOP_Profile):
-        * tao/IIOP_Connector.h (TAO_IIOP_Connector):
-        * tao/IIOP_Acceptor.cpp (TAO_IIOP_Acceptor):
-
-          Added orb core as data member.
-
-        * tao/UIOP_Acceptor.cpp
-        * tao/UIOP_Acceptor.h
-        * tao/UIOP_Connector.cpp
-        * tao/UIOP_Connector.h
-        * tao/UIOP_Profile.cpp
-        * tao/UIOP_Profile.h
-
-          Made identical changes to the UIOP side as described above for
-          IIOP.  Note that currently we don't need an ORB Core in the UIOP
-          Profile.  However, changes were still made for the sake of
-          consistency.
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp (activate_object): Added
-          ORB Core parameter to IIOP Profile constructor.
-
-Tue Jun  8 20:32:39 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (init): Fixed a minor bug in the processing of
-          unknown -ORB arguments.
-
-Tue Jun  8 20:24:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp:
-          Fixed argument parsing, thanks to Nanbor for pointing this out.
-
-Tue Jun  8 20:19:15 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * tao/Principal.i
-        * tao/Request.cpp,i:
-          Fixed inline use before declaration problem.
-
-Tue Jun  8 19:48:01 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/ast/ast_module.cpp:
-          Added TCKind to the CORBA:: scoped names added to the
-          symbol table when module CORBA is first added to the
-          scopes. I noticed that CORBA::TCKind is used as a
-          return type in the forthcoming Dynamic Any spec and
-          so it couldn't hurt to add IDL compiler recognition
-          of it now.
-
-Tue Jun  8 18:57:00 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/Default_Servant/server.cpp
-        * examples/POA/Default_Servant/client.cpp
-        * examples/POA/Generic_Servant/MyFooServant.cpp
-        * examples/POA/Identity/Identity.cpp
-        * examples/POA/NewPOA/NewPOA.cpp
-        * examples/POA/On_Demand_Activation/server.cpp
-        * examples/POA/On_Demand_Loading/Servant_Manager.cpp
-        * examples/POA/RootPOA/RootPOA.cpp
-        * TIE/client.cpp
-        * TIE/server.cpp: Made changes to the way exceptions were being
-        handled. Some comments were added to make the printout from  ACE_PRINT_EXCEPTION
-        look meaningful.
-
-Tue Jun 08 18:50:00 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * /orbsvcs/tests/AVStreams/benchmark/svc.conf
-        * /orbsvcs/tests/AVStreams/benchmark/clnt.conf
-        * /performance-tests/Thruput/TAO/svc.conf
-        * /MT_Client/client.conf
-        * /NestedUpcall/MT_Client_Test/client.conf
-        * /orbsvcs/tests/ImplRepo/implrepo.conf
-        * /orbsvcs/tests/Time/implrepo.conf
-
-          Modified these files to remove redundant configuration options.
-
-        * /orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
-        * /orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
-        * /orbsvcs/tests/ImplRepo/svc.conf
-        * /tests/Param_Test/svc.conf
-        * /examples/POA/On_Demand_Loading/svc.conf
-        * /examples/Simulator/DOVEMIB/svc.conf
-        * /examples/Simulator/Event_Supplier/svc.conf
-        * /MT_Client/client.global.conf
-
-          Removed the *.conf files above since they contained only
-          redundant options.
-
-        * /orbsvcs/Event_Service/svc.conf
-        * /orbsvcs/tests/Event/Basic/svc.conf
-        * /orbsvcs/tests/EC_Mcast/svc.conf
-        * /orbsvcs/CosEvent_Service/svc.conf
-        * /tests/FL_Cube/svc.conf
-        * /tests/NestedUpcall/Reactor/svc.conf
-        * /examples/Simple/time-date/svc.conf
-        * /examples/POA/Identity/svc.conf
-        * /performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
-        * /performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
-        * /performance-tests/Cubit/TAO/MT_Cubit/svc.conf
-        * /performance-tests/POA/Object_Creation_And_Registration/svc.conf
-        * /POA/Explicit_Activation/alternate.conf
-        * /Quoter/client.conf
-        * /Quoter/server.conf
-        * /MT_Client/client.tss.conf
-        * /MT_Client/server.conf
-        * /NestedUpcall/Reactor/svc.mt.conf
-        * /orbsvcs/tests/Event/Basic/sched.conf
-        * /orbsvcs/tests/Event/Basic/observer.conf
-        * /orbsvcs/tests/Event/Performance/ec.mt.conf
-        * /orbsvcs/tests/Event/Performance/ec.st.conf
-        * /orbsvcs/tests/EC_Throughput/ec.conf
-        * /orbsvcs/tests/EC_Throughput/ec.mt.conf
-
-        Retained the *.conf files above as they were originally.
-        Thanks to Irfan, Nanbor, Naga, Carlos, David of the DOC group for
-        helping me with this.
-
-Tue Jun 08 18:17:38 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA.cpp (find_POA): Must release the Object Adapter lock
-          before calling the Adapter Activators which may call back into
-          the POA (create_POA) causing a deadlock.  Thanks to Carlos for
-          pointing this out.
-
-        * performance-tests/POA/Object_Creation_And_Registration/svc.conf:
-          Changed ORBTableSize to ORBActiveObjectMapSize. Also, removed
-          POA lock null option.
-
-Tue Jun  8 17:12:24 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        Made the ORB_var to be after all other _var member variables.
-
-        * /orbsvcs/Time_Service/Clerk_i.h
-        * /orbsvcs/Time_Service/Server_i.h
-        * /orbsvcs/Time_Service/IR_Helper.h
-        * /orbsvcs/tests/Time/Client_i.h
-
-        * docs/Options.html : Updated the -ORBInitRef to include the
-          filetype IOR.
-
-Tue Jun 08 16:10:09 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/corbafwd.h: fixed comments that describe the minor code
-          format.
-
-Tue Jun  8 16:06:15 1999  Pradeep Gore  <pradeep@danzon.cs.wustl.edu>
-
-        * examples/Event_Comm/Consumer_Handler.h:
-        * examples/Event_Comm/Notifier_Handler.h:
-        * examples/Simple/chat/Client_i.h:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.h:
-          Reordered the CORBA::ORB_var declaration in these files so that
-          the ORB_var is destroyed after all the other "_var" members.
-
-Tue Jun 08 15:47:25 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Object.i:
-        * tao/Typecode.i:
-        * tao/ORB.i: Moved is_nil and release around to avoid inline
-          functions being used before declared inlined warnings.  Thanks
-          to David for pointing this out.
-
-Tue Jun  8 15:53:54 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
-
-        * orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
-          (getCriteriaMember): Fixed a const-correctness problem.  Thanks
-          to Michael Kircher for this.
-
-        * Fixed the capitalization of all options in TAO's svc.conf files.
-
-        * tao/ORB_Core.cpp,
-          tao/default_resource.cpp,
-          tao/default_server.cpp,
-          tao/default_client.cpp: Fixed the parsing of options
-          so that they are case insensitive, e.g., "-ORBsvcconf" is the
-          same as "-ORBSvcConf".  This allows us to use more intuitive
-          "intercap" spelling in the documentation without breaking
-          existing software.
-
-        * tao/ORB_Core.cpp (init): If an non "-ORB" argument is given to
-          ORB_init() we now print a warning message (if the
-          TAO_debug_level > 0) and "consume" the argument.  This is in
-          accordance with the CORBA spec.
-
-Tue Jun  8 15:38:01 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * docs/Options.html:
-        * tao/default_client.cpp (create_transport_mux_strategy): Renamed
-        the ORBtransportmuxstrategy to ORBRequestMuxStrategy.
-
-Tue Jun 08 15:12:05 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/Loader/Servant_Activator.cpp (ServantActivator_i):
-          Fixed "ANSI C++ forbids casting between pointers to functions
-          and objects" warning.  Thanks to David for pointing this out.
-
-Tue Jun  8 15:15:09 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/param_test_i.h:
-        * TAO/tests/Param_Test/param_test_i.cpp:
-        * TAO/tests/NestedUpcall/MT_Client_Test/client.h:
-          Moved class member ORB_var orb_ up the list so
-          it will get destroyed after other _vars.
-
-        * tao/DynArray_i.h:
-        * tao/DynArray_i.cpp:
-        * tao/DynSequence_i.h:
-        * tao/DynSequence_i.cpp:
-        * tao/DynStruct_i.h:
-        * tao/DynStruct_i.cpp:
-        * tao/DynUnion_i.h:
-        * tao/DynUnion_i.cpp:
-          Renamed member 'index_' as 'current_index_'
-          just to be safe.
-
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-          Added missing case to function visit_constant().
-          Thanks to Sridevi Subramanian <subrams@erols.com>
-          for pointing out this problem.
-
-Tue Jun  8 15:09:35 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/Callback_Quoter/Consumer_i.h (class Consumer):
-        * examples/Callback_Quoter/Consumer_Handler.h (class Consumer_Handler):
-        * examples/Callback_Quoter/Supplier_i.h (class Supplier):
-
-          Moved the CORBA::ORB_var before the other vars in the member
-          declaration so that it gets destructed last.
-
-Tue Jun  8 15:03:02 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * orbsvcs/tests/Property/client.h:
-        * orbsvcs/tests/Property/client.cpp: Fixed the SunCC5.0 warnings.
-
-Tue Jun 08 13:36:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Stub.{h,i} (servant_orb): Added data member servant_orb_ and
-          its accessor and mutator.  This ORB_var stores the pointer of a
-          collocated servant and is used to locate/query the servant/POA.
-
-Mon Jun 07 15:47:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/Options.html: Documented ORB options -ORBglobalcollocation
-          and -ORBcollocationStrategy.
-
-        * tao/ORB_Core.{h,i,cpp}: Removed accessor/mutator
-          using_collocation methods.  They have been replaced by
-          optimize_collocation_objects.  Added enum definition for
-          collocation_strategy and get_collocation_strategy which is an
-          accessor for ORB's collocation strategy.  TAO will support two
-          strategies THRU_POA and DIRECT which should be self-explaining.
-          The default strategy will be THRU_POA because it is considered
-          the safe thing to do.  Veteran users might consider using DIRECT
-          collocation strategy if situation allows.  A third strategy
-          "ORB_CONTROL" is the default value passed to
-          Servant_Base::_create_collocated_objref.  This makes all servant
-          to query the ORB to decide which collocation strategy to use.
-          But we can also provide per-object collocation strategy in a
-          later point of time.
-
-          (init): Added a new option -ORBcollocationstrategy which takes
-          two possible values "thru_poa" and "direct".  The defualt is, of
-          course, "thru_poa".
-
-        * tao/Servant_Base.{h,cpp} (_create_collocated_objref): Added a
-          factory method to strategize what collocated object
-          implementation we want to use and also to decouple the stubs and
-          skeletons code.
-
-        * tao/Exception.h: Reordered class member functions to put all TAO
-          extensions at the end of the public section of each class.
-          Added more comments.
-
-        * tao/Exception.{h,cpp} (_tao_print_exception): Renamed
-          <print_exception> to _tao_print_exception to avoid clashing with
-          user defined methods.
-          (_tao_print_system_exception): Renamed <print_exception_tao_> to
-          _tao_print_system_exception to avoid name clashing.
-          (_tao_minor_code,_tao_errno): Rename <minor_code_tao_> and
-          <errno_tao_> to _tao_minor_code and _tao_errno to avoid name
-          clashing.
-
-          Changed several uses of "new" to ACE_NEW_THROW_EX.
-
-        * tao/POA.cpp:
-        * tao/Invocation.cpp:
-        * tao/GIOP.cpp: Changed the use of minor_code_tao_ to
-          _tao_minor_code.
-
-        * tao/TAO.{h,cpp}:
-        * tao/GIOP_Server_Request.cpp (marshal): Changed to use ACE_TRY
-          macros and made sure the code is exception safe.
-
-        * tao/orbconf.h (TAO_NAMESPACE_INLINE_FUNCTION): Inline function
-          within a namespace must be treated differently.  On most
-          platform, using TAO_NAMESPACE_STORAGE_CLASS would work for
-          functions within a namespace.  However, since the macro uses
-          TAO_Export, which totally confuses MSVC to think that the
-          symbols for these functions are to be exported while in fact,
-          they are only inline functions and do not need any entry point
-          at all.  The newly added macro (TAO_NAMESPACE_INLINE_FUNCTION)
-          separates out this situation and simply uses the "inline"
-          keyword.
-
-        * tao/Marshal.h: Added #include "tao/Principal.h" because
-          Marshal.i uses inline functions in Principal.i.
-
-        * tao/Context.{i,cpp}:
-        * tao/Environment.{i,cpp}:
-        * tao/NVList.{i,cpp}:
-        * tao/ORB.{i,cpp}:
-        * tao/Object.{i,cpp}:
-        * tao/Principal.{i,cpp}:
-        * tao/ValueBase.{i,cpp}:
-        * tao/Request.{i,cpp}:
-        * tao/Server_Request.{i,cpp}:
-        * tao/Typecode.{i,cpp}:
-        * tao/corbafwd.{i,cpp}: Re-inlined string_alloc, string_free,
-          is_nil and release methods.
-
-Tue Jun 08 14:39:55 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/corbafwd.h,Exception.cpp: added minor code support for
-          ENOENT, EBADF, EPERM, and EAFNOSUPPORT errno values.
-
-Tue Jun 08 14:15:52 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO version 0.3.24 released.
-
-Tue Jun 08 10:00:12 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Simple/time-date/Makefile: added some Time_Date*
-          files to FILES and LDLIBS to LIBS, to enable creation of the
-          shlib without warnings on DU 5.0.
-
-Tue Jun 08 09:42:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/client.cpp (execute): added .ptr ()
-          derference of orb_ before comparing it to 0.
-
-Tue Jun 08 00:15:44 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/Loader/Servant_Activator.cpp (ServantActivator_i):
-        * examples/POA/On_Demand_Loading/Servant_Manager.cpp (obtain_servant):
-
-          Fixed void* to function pointer cast.
-
-Tue Jun  8 00:19:02 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Files modified: Acceptor_Registry.cpp, Acceptor_Registry.h,
-          Connector_Registry.cpp, Connector_Registry.h, IIOP_Acceptor.cpp,
-          IIOP_Connector.cpp, IIOP_Connector.h, IIOP_Profile.cpp,
-          IIOP_Profile.h, IIOP_Profile.i, Invocation.cpp, ORB.cpp,
-          ORB_Core.cpp, Object.cpp, Pluggable.cpp, Pluggable.h,
-          UIOP_Acceptor.cpp, UIOP_Connector.cpp, UIOP_Profile.cpp,
-          UIOP_Profile.h, UIOP_Profile.i, UIOP_Transport.h
-
-        * Changed the interface to Connector_Registry.  Altered connect()
-          method to accept profiles rather than a Stub Object pointer.
-
-        * tao/Acceptor_Registry: comments updates
-
-        * tao/IIOP_Acceptor: Comments and fixed is_collocated to use the
-          cached copy of the local address.
-
-        * tao/IIOP_Connector: comments and fixed use of
-          profile->addr_to_string
-
-        * tao/IIOP_Profile: Comments, changes add_to_string to accept a
-          buffer.  changed _key () to be _key (void), removed use of body_
-          (CDR stream).
-
-        * tao/Invocation: comments and fixed use of
-          connector_registry->connect ()
-
-        * tao/ORB.cpp: comments and fixed use of profile->_key () to not
-          include ENV.
-
-        * tao/ORB_Core: comments
-
-        * tao/Pluggable: comments and fixed TAO_XX_Profile::addr_to_string ()
-          to include a buffer, alsoc TAO_XX_Profile::_key () to not
-          include ENV.
-
-        * tao/UIOP_{Acceptor,Connector,Profile,Transport}: comments and
-          also UIOP_Profile::_key() and UIOP_Profile::addr_to_string.
-
-Tue Jun  8 00:09:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/MT_Client/run_test.pl:
-          The test driver works more reliably now.
-
-        * tests/NestedUpcall/Reactor/client.h:
-        * tests/NestedUpcall/Reactor/mt_client.h:
-          Fixed ORB vs. servants order
-
-Mon Jun 07 23:39:40 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Object_Adapter.cpp (Servant_Upcall): The code in the
-          destructor of POA Current must be run before the Object Adapter
-          lock is released. With the reorganization Nanbor and I did, this
-          was no longer true.  Therefore, the solution was to move the
-          code from the destructor to a teardown() method which is run
-          before the Object Adapter lock is released.
-
-        * tao/IIOP_Connect: Removed the following extra and unused
-          functions:
-
-          - TAO_IIOP_Server_Connection_Handler::handle_message
-          - TAO_IIOP_Server_Connection_Handler::handle_locate
-          - TAO_UIOP_Server_Connection_Handler::handle_message
-          - TAO_UIOP_Server_Connection_Handler::handle_locate
-
-        * tao/GIOP: Moved the exception handling code from
-          process_server_message() to process_server_request() and
-          process_server_locate().  This was necessary since the two
-          handle exceptions in different ways: process_server_request()
-          propogates to the client in a GIOP::Reply while
-          process_server_locate() propogates to the client in a
-          GIOP::LocateReply.  BTW, the credit/blame for this goes to
-          Carlos.
-
-        * examples/POA/Forwarding/client.cpp (main): Fixed exception
-          handling.
-
-        * examples/POA/Forwarding/Servant_Locator.cpp (preinvoke): The
-          forwarding location must be specified when constructing the
-          ForwardRequest.
-
-        * examples/POA/FindPOA/FindPOA.cpp (main): POA Manager must be
-          activated before use.
-
-        * tao/TAO.h (TAO_ORB_Manager): Added POA Manager accessor.
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.h (AdapterActivator):
-        * tao/POA.cpp (TAO_Adapter_Activator::unknown_adapter):
-
-          Held on to the POA Manager.  If we don't, we'll have to create a
-          new one and then we'll have to worry about its state (remember
-          that POA Managers are created in holding state).
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i:
-        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
-
-          Fixed improper use of return values from the ORB Manager.  Since
-          the ORB Manager duplicates the data members before returning
-          them, we must store them in vars.
-
-        * orbsvcs/tests/ImplRepo/IR_Helper.cpp (IR_Helper): Since the POA
-          and ORB are kept as vars, we must duplicate them since keep them
-          around in the constructor.
-
-Mon Jun  7 23:49:51 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-        * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp:
-          Fixed problems with conversion from T_var to T_ptr for g++ 2.7.X
-
-        * orbsvcs/tests/Event/Basic/Observer.cpp:
-        * orbsvcs/tests/Event/Performance/Connect.cpp:
-        * orbsvcs/tests/Event/Performance/Throughput.cpp:
-          More T_var to T_ptr problems and a few unused variables.
-
-Mon Jun  7 21:57:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/append.cpp:
-        * tao/skip.cpp:
-          The marshaling and demarshaling code for object references
-          inside anys was broken, it only handled IIOP profiles and used
-          chars where octets where needed.
-
-        * tao/UIOP_Profile.cpp:
-          Improve debugging messages and handle errors more gracefully.
-
-        * tests/Param_Test/Makefile:
-        * tests/Param_Test/server.cpp:
-          Minor cosmetic fixes
-
-Mon Jun  7 20:37:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/client.h:
-        * orbsvcs/tests/Simple_Naming/client.cpp: The ORB was being
-          leaked: the TAO_ORB_Manager::orb() method returns a duplicate
-          and that was not getting released in both the MT_Test
-          constructor invocation and in the naming_client.init() call.
-
-        * tao/ORB.cpp: The naming service and other object references
-          should be release *before* releasing the ORB core.
-
-        * tao/ORB_Core.cpp: Made the use of ACE_CString in the ORB_Table
-          explicit, so we understand what is going on.
-
-Mon Jun  7 16:13:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Exception.h:
-        * tao/Exception.cpp:
-        * tao/Invocation.cpp: The system exceptions were not being
-          demarshaled on the server side.  Fixed the signature of
-          TAO_Exceptions::create_system_exception, it was returning a
-          CORBA::Exception* but a CORBA::SystemException* was better.
-
-        * tao/IIOP_Acceptor.cpp:
-        * tao/IIOP_Connector.cpp: Added a few debugging messages if there
-          is an error.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h:
-        * performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp: The
-          Cubit_i objects were activated with the _default_POA(), but that
-          was not overriden, hence they were using the
-          default/_default_POA which is the RootPOA of the default ORB.
-          There was also an activation under a child POA but that was not
-          exported through the IORs printed to the file.
+	* tao/Invocation.cpp:
+	  The system exceptions were not beign demarshaled on the server
+	  side.
+	  Fixed the signature of TAO_Exceptions::create_system_exception,
+	  it was returning a CORBA::Exception* but a
+	  CORBA::SystemException* was better.
+
+	* tao/IIOP_Acceptor.cpp:
+	* tao/IIOP_Connector.cpp:
+	  Added a few debugging messages if there is an error.
+
+	* performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h:
+	* performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp:
+	* performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp:
+	* performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
+	  The Cubit_i objects were activated with the _default_POA(), but
+	  that was not overriden, hence they were using the
+	  default/_default_POA which is the RootPOA of the default ORB.
+	  There was also an activation under a child POA but that was not
+	  exported through the IORs printed to the file.
 
 Mon Jun 07 15:14:47 1999  David L. Levine  <levine@cs.wustl.edu>
 
-        * utils/catior/catior.cpp (cat_iiop_profile): added missing read
-          of port_number from the str.
+        * utils/catior/catior.cpp (cat_iiop_profile): added missing
+          read of port_number from the str.
 
-        * utils/catior/README: updated to mention that there's now a test
-          subdirectory containing samples, instead of just a single sample
-          file.
+        * utils/catior/README: updated to mention that there's now
+          a test subdirectory containing samples, instead of just
+          a single sample file.
 
 Mon Jun  7 12:39:14 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
 
@@ -1940,9 +150,9 @@ Mon Jun  7 12:39:14 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
 Mon Jun 07 11:51:52 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
-          (svc,cube_octet,do_test): added timestamps and an errno
-          printout, for debugging purposes.  The errno printout should be
-          removed later.
+          (svc,cube_octet,do_test): added timestamps and an
+          errno printout, for debugging purposes.  The errno
+          printout should be removed later.
 
 Mon Jun 07 10:43:12 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
@@ -1971,9 +181,7 @@ Sun Jun 06 23:17:05 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
         * tao/POAC: Changed <InvalidPolicy::slot> back to
           <InvalidPolicy::index>.  We can't rename this since it is
-          specified in the CORBA spec.  Please let us know if this breaks
-          anything on compilers like MVS C++ and we'll figure out another
-          workaround.
+          specified in the CORBA spec.
 
         * tao/GIOP.cpp (process_server_locate): Initialized <status> to
           TAO_GIOP_UNKNOWN_OBJECT. This is a safe initial value and will
@@ -1989,15 +197,16 @@ Sun Jun 06 23:17:05 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 Sun Jun  6 22:09:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
         * orbsvcs/orbsvcs/AV/sfp.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader.cpp: Fixed duplicate template
-          instantiations, IRIX does not like that.
+        * orbsvcs/orbsvcs/Trader/Trader.cpp:
+          Fixed duplicate template instantiations, IRIX does not like
+          that.
 
 Sun Jun 06 21:42:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
         * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp: A couple of .idl file where
-          not re-compiled when the DIL compiler changed, fixed the
-          dependencies.
+        * orbsvcs/orbsvcs/orbsvcs_static.dsp:
+          A couple of .idl file where not re-compiled when the DIL
+          compiler changed, fixed the dependencies.
 
 Sun Jun  6 20:25:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
@@ -2026,27 +235,30 @@ Sun Jun  6 20:25:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
         * TAO_IDL/util/utl_error.cpp:
         * TAO_IDL/util/utl_global.cpp:
         * TAO_IDL/util/utl_string.cpp:
-        * TAO_IDL/util/utl_strlist.cpp: Obliterated any references to
-          'String' this was just a macro that expanded to the UTL_String
-          class, but was an endless sort of confusion with just a typedef
-          for 'char*' Also cleaned up the use of UTL_Strings in the
-          idl_global interface.  This seems to have put the IDL compiler
-          into usable state again.
+        * TAO_IDL/util/utl_strlist.cpp:
+          Obliterated any references to 'String' this was just a macro
+          that expanded to the UTL_String class, but was an endless sort
+          of confusion with just a typedef for 'char*'
+          Also cleaned up the use of UTL_Strings in the idl_global
+          interface.
+          This seems to have put the IDL compiler into usable state
+          again.
 
 Sun Jun  6 18:55:00 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * TAO_IDL/util/utl_global.cpp: Fixed several memory managment
-          problems
+        * TAO_IDL/util/utl_global.cpp:
+          Fixed several memory managment problems
 
 Sun Jun  6 18:04:05 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
         * TAO_IDL/include/drv_extern.h:
-        * TAO_IDL/driver/drv_preproc.cpp: More constness fixes
+        * TAO_IDL/driver/drv_preproc.cpp:
+          More constness fixes
 
 Sun Jun  6 17:42:41 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * TAO_IDL/tao_idl.cpp: Fixed DRV_drive() it is taking a const
-          char* now
+        * TAO_IDL/tao_idl.cpp:
+          Fixed DRV_drive() it is taking a const char* now
 
 Sun Jun  6 15:14:13 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
 
@@ -2060,7 +272,8 @@ Sun Jun  6 15:14:13 1999  Douglas C. Schmidt  <schmidt@danzon.cs.wustl.edu>
 
 Sun Jun  6 17:08:57 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/GIOP.cpp: More @@ comments addressed.
+        * tao/GIOP.cpp:
+          More @@ comments addressed.
 
 Sun Jun  6 16:14:50 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
@@ -2443,8 +656,8 @@ Fri Jun 04 16:11:30 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
         * tao/Server_Request.{i,cpp}:
         * tao/Typecode.{i,cpp}:
         * tao/corbafwd.{i,cpp}: Unlined a bunch of methods in CORBA
-          namespace to avoid duplicate definitions on platforms with
-          namespace support.
+	  namespace to avoid duplicate definitions on platforms with
+	  namespace support.
 
 Fri Jun 04 15:25:38 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
@@ -5976,7 +4189,7 @@ Wed May 12 10:18:34 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
         * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
         * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
         * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: Some servants where
-          not being properly deactivated, thanks to J. Russell Noseworthy
+          not beign properly deactivated, thanks to J. Russell Noseworthy
           <rnosewor@objectsciences.com> for pointing this out.
 
 Wed May 12 10:16:15 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 7ba14e01274..5067d54262a 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.3.24
-    ACE VERSION: 4.6.41
+    TAO VERSION: 0.3.23
+    ACE VERSION: 4.6.40
 
     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 885cc435295..c9a7e7f8ded 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -37,7 +37,7 @@
 
 <P>Any UNIX/POSIX/Win32 variation is a potential target platform for
 ACE.  If you have <A
-HREF="http://www.cs.wustl.edu/~schmidt/docs/ACE-porting.html">porting
+HREF="docs/ACE-porting.html">porting
 questions</A> or have a problem compiling the ACE wrappers on the
 platforms shown above please send email to either <A
 HREF="news:comp.soft-sys.ace">ACE Newsgroup</A> or the <A
@@ -177,25 +177,15 @@ target.<p>
 <H3>On Windows NT</H3>
 
 <P><CODE>TAO_IDL</CODE> on NT will look for the Microsoft Visual C++
-compiler as <CODE>"C:\Program Files\DevStudio\VC\bin\CL.EXE"</CODE>.
-If this compiler is located elsewhere (or if using a different
-compiler) add a variable <CODE>CPP_LOCATION</CODE> to your environment
-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>.
-      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
-      are better off definining the environment variable in all
-      cases.
+compiler as "C:\Program Files\DevStudio\VC\bin\CL.EXE".  If this
+compiler is located elsewhere (or if using a different compiler)
+add a variable CPP_LOCATION to your environment and set it to the compiler
+you want to use.  This variable will override the default.
 </P>
 
-<p><a href="http://www.torus-software.com/">Barry
+<p><a href="http://www.panix.com/~hoggardb/index.shtml">Barry
 Hoggard</a> maintains a <a
-href="http://www.torus-software.com/corba/">CORBA Page</a>
+href="http://www.panix.com/~hoggardb/corba/">CORBA Page</a>
 which contains very helpful information on setting MSVC project
 settings for TAO applications.</P>
 
diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile
index a0886d67f9d..c3431a717c5 100644
--- a/TAO/TAO_IDL/Makefile
+++ b/TAO/TAO_IDL/Makefile
@@ -257,6 +257,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -340,6 +342,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -423,6 +427,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -506,6 +512,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -610,6 +618,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -697,6 +707,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -780,6 +792,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -870,6 +884,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -954,6 +970,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1038,6 +1056,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1122,6 +1142,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1206,6 +1228,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1290,6 +1314,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1374,6 +1400,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1454,9 +1482,10 @@ tags:
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
  include/fe_private.h include/fe_interface_header.h \
  include/fe_declarator.h
-.obj/lex.yy.o .obj/lex.yy.so .shobj/lex.yy.o .shobj/lex.yy.so: fe/lex.yy.cpp \
- $(ACE_ROOT)/ace/OS.h \
+.obj/lex.yy.o .obj/lex.yy.so .shobj/lex.yy.o .shobj/lex.yy.so: fe/lex.yy.cpp $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1467,11 +1496,11 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- include/idl.h include/intlmacros.h include/idl_narrow.h \
- include/idl_defines.h include/idl_fwd.h include/idl_bool.h \
- include/utl_string.h include/utl_identifier.h include/ast.h \
- include/utl_scoped_name.h include/ast_decl.h include/ast_expression.h \
+ $(ACE_ROOT)/ace/Log_Record.i include/idl.h \
+ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
+ include/idl_fwd.h include/idl_bool.h include/utl_string.h \
+ include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
+ include/ast_decl.h include/ast_expression.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
@@ -1542,6 +1571,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1624,6 +1655,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1706,6 +1739,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1788,6 +1823,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1870,6 +1907,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1952,6 +1991,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2034,6 +2075,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2116,6 +2159,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2198,6 +2243,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2280,6 +2327,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2362,6 +2411,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2444,6 +2495,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2526,6 +2579,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2608,6 +2663,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2690,6 +2747,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2772,6 +2831,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2854,6 +2915,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2936,6 +2999,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3018,6 +3083,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3100,6 +3167,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3182,6 +3251,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3264,6 +3335,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3346,6 +3419,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3428,6 +3503,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3510,6 +3587,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3592,6 +3671,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3674,6 +3755,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3756,6 +3839,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3838,6 +3923,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3920,6 +4007,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4002,6 +4091,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4084,6 +4175,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4166,6 +4259,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4248,6 +4343,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4330,6 +4427,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4412,6 +4511,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4494,6 +4595,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4576,6 +4679,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4658,6 +4763,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4740,6 +4847,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4822,6 +4931,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4904,6 +5015,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4986,6 +5099,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5068,6 +5183,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5150,6 +5267,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5232,6 +5351,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5314,6 +5435,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5392,8 +5515,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -5418,6 +5540,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5496,8 +5620,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -5522,6 +5645,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5600,8 +5725,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -5626,6 +5750,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5704,8 +5830,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -5730,6 +5855,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5808,8 +5935,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -5834,6 +5960,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5912,8 +6040,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -5938,6 +6065,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6016,8 +6145,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -6042,6 +6170,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6120,8 +6250,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -6146,6 +6275,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6224,8 +6355,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -6250,6 +6380,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6347,7 +6479,9 @@ tags:
  be_include/be_visitor_interface/cdr_op_ci.h \
  be_include/be_visitor_interface/cdr_op_cs.h \
  be_include/be_visitor_interface/tie_sh.h \
- be_include/be_visitor_interface/tie_si.h be_include/be.h \
+ 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.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
@@ -6373,6 +6507,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6451,8 +6587,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -6477,6 +6612,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6555,8 +6692,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -6581,6 +6717,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6659,8 +6797,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -6685,6 +6822,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6763,8 +6902,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -6789,6 +6927,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6867,8 +7007,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -6893,6 +7032,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6971,8 +7112,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -6997,6 +7137,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7075,8 +7217,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -7101,6 +7242,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7179,8 +7322,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -7205,6 +7347,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7283,8 +7427,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -7321,6 +7464,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7399,8 +7544,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -7425,6 +7569,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7503,8 +7649,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -7529,6 +7674,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7607,8 +7754,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -7633,6 +7779,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7711,8 +7859,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -7737,6 +7884,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7815,8 +7964,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -7841,6 +7989,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7919,8 +8069,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -7945,6 +8094,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8023,8 +8174,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8049,6 +8199,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8127,8 +8279,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8153,6 +8304,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8231,8 +8384,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8258,6 +8410,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8336,8 +8490,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8362,6 +8515,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8440,8 +8595,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8466,6 +8620,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8544,8 +8700,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8570,6 +8725,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8648,8 +8805,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8674,6 +8830,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8752,8 +8910,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8779,6 +8936,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8857,8 +9016,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8883,6 +9041,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8961,8 +9121,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -8987,6 +9146,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9065,8 +9226,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -9092,6 +9252,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9170,8 +9332,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -9209,6 +9370,7 @@ tags:
  be_include/be_visitor_argument/compiled_marshal_cs.h \
  be_include/be_visitor_argument/compiled_marshal_ss.h \
  be_include/be_visitor_argument/pre_invoke_cs.h \
+ be_include/be_visitor_argument/arglist_ami.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 \
@@ -9265,6 +9427,8 @@ tags:
  be_include/be_visitor_interface/cdr_op_cs.h \
  be_include/be_visitor_interface/tie_sh.h \
  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_fwd.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ch.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ci.h \
@@ -9325,6 +9489,9 @@ tags:
  be_include/be_visitor_operation/rettype_marshal_ss.h \
  be_include/be_visitor_operation/compiled_marshal.h \
  be_include/be_visitor_operation/rettype_pre_invoke_cs.h \
+ be_include/be_visitor_operation/operation_ami_ch.h \
+ be_include/be_visitor_operation/operation_ami_cs.h \
+ be_include/be_visitor_operation/arglist_ami.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 \
@@ -9397,6 +9564,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9498,6 +9667,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9612,6 +9783,7 @@ tags:
  be_include/be_visitor_argument/compiled_marshal_cs.h \
  be_include/be_visitor_argument/compiled_marshal_ss.h \
  be_include/be_visitor_argument/pre_invoke_cs.h \
+ be_include/be_visitor_argument/arglist_ami.h \
  be/be_visitor_argument/arglist.cpp \
  be/be_visitor_argument/argument.cpp \
  be/be_visitor_argument/docall_cs.cpp \
@@ -9626,11 +9798,14 @@ tags:
  be/be_visitor_argument/vardecl_ss.cpp \
  be/be_visitor_argument/compiled_marshal_cs.cpp \
  be/be_visitor_argument/compiled_marshal_ss.cpp \
- be/be_visitor_argument/pre_invoke_cs.cpp
+ be/be_visitor_argument/pre_invoke_cs.cpp \
+ be/be_visitor_argument/arglist_ami.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 \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9709,8 +9884,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -9748,6 +9922,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9826,8 +10002,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -9856,6 +10031,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9934,8 +10111,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -9966,6 +10142,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10044,8 +10222,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -10070,6 +10247,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10148,8 +10327,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -10175,6 +10353,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10253,8 +10433,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -10289,6 +10468,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10367,8 +10548,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -10423,6 +10603,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10501,8 +10683,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -10537,6 +10718,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10615,8 +10798,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -10657,6 +10839,8 @@ tags:
  be_include/be_visitor_interface/cdr_op_cs.h \
  be_include/be_visitor_interface/tie_sh.h \
  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/be_visitor_interface/interface.cpp \
  be/be_visitor_interface/interface_ch.cpp \
  be/be_visitor_interface/interface_ci.cpp \
@@ -10673,12 +10857,19 @@ tags:
  be/be_visitor_interface/any_op_cs.cpp \
  be/be_visitor_interface/cdr_op_ch.cpp \
  be/be_visitor_interface/cdr_op_ci.cpp \
- be/be_visitor_interface/cdr_op_cs.cpp
+ be/be_visitor_interface/cdr_op_cs.cpp \
+ be/be_visitor_interface/ami_handler_fwd_ch.cpp \
+ 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 \
+ be_include/be_visitor_interface_fwd/cdr_op_ci.h \
+ be/be_visitor_interface/ami_handler_fwd_ci.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/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10757,8 +10948,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -10791,6 +10981,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10869,8 +11061,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -10948,6 +11139,9 @@ tags:
  be_include/be_visitor_operation/rettype_marshal_ss.h \
  be_include/be_visitor_operation/compiled_marshal.h \
  be_include/be_visitor_operation/rettype_pre_invoke_cs.h \
+ be_include/be_visitor_operation/operation_ami_ch.h \
+ be_include/be_visitor_operation/operation_ami_cs.h \
+ be_include/be_visitor_operation/arglist_ami.h \
  be/be_visitor_valuetype/field_ch.cpp \
  be/be_visitor_valuetype/field_cs.cpp \
  be/be_visitor_valuetype/field_cdr_ci.cpp \
@@ -10959,10 +11153,11 @@ 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/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11041,8 +11236,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -11072,6 +11266,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11150,8 +11346,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -11186,6 +11381,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11264,8 +11461,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -11317,6 +11513,9 @@ tags:
  be_include/be_visitor_operation/rettype_marshal_ss.h \
  be_include/be_visitor_operation/compiled_marshal.h \
  be_include/be_visitor_operation/rettype_pre_invoke_cs.h \
+ be_include/be_visitor_operation/operation_ami_ch.h \
+ be_include/be_visitor_operation/operation_ami_cs.h \
+ be_include/be_visitor_operation/arglist_ami.h \
  be/be_visitor_operation/operation.cpp \
  be/be_visitor_operation/arglist.cpp \
  be/be_visitor_operation/argument.cpp \
@@ -11346,6 +11545,7 @@ tags:
  be_include/be_visitor_argument/compiled_marshal_cs.h \
  be_include/be_visitor_argument/compiled_marshal_ss.h \
  be_include/be_visitor_argument/pre_invoke_cs.h \
+ be_include/be_visitor_argument/arglist_ami.h \
  be/be_visitor_operation/operation_is.cpp \
  be/be_visitor_operation/rettype.cpp \
  be/be_visitor_operation/rettype_is.cpp \
@@ -11360,11 +11560,16 @@ tags:
  be/be_visitor_operation/rettype_vardecl_ss.cpp \
  be/be_visitor_operation/tie_sh.cpp be/be_visitor_operation/tie_si.cpp \
  be/be_visitor_operation/compiled_marshal.cpp \
- be/be_visitor_operation/rettype_pre_invoke_cs.cpp
+ be/be_visitor_operation/rettype_pre_invoke_cs.cpp \
+ be/be_visitor_operation/operation_ami_ch.cpp \
+ be/be_visitor_operation/operation_ami_cs.cpp \
+ be/be_visitor_operation/arglist_ami.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 \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11443,8 +11648,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -11486,6 +11690,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11564,8 +11770,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -11591,6 +11796,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11669,8 +11876,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -11735,6 +11941,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11813,8 +12021,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -11865,6 +12072,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11943,8 +12152,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -11975,6 +12183,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12053,8 +12263,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -12098,6 +12307,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12176,8 +12387,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
@@ -12219,10 +12429,11 @@ 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/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12301,8 +12512,7 @@ tags:
  include/utl_error.h include/utl_indenter.h include/idl_extern.h \
  include/fe_extern.h include/be_extern.h include/drv_extern.h \
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.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 \
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 3a57e842b2a..e3614c509bd 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -1433,28 +1433,25 @@ AST_Expression::eval_un_op(AST_Expression::EvalKind ek)
   pd_v1->set_ev(pd_v1->eval_internal(ek));
   if (pd_v1->ev() == NULL)
     return NULL;
+  pd_v1->set_ev(pd_v1->coerce(EV_double));
+  if (pd_v1->ev() == NULL)
+    return NULL;
 
   retval = new AST_ExprValue;
   retval->et = EV_double;
 
   switch (pd_ec) {
   case EC_u_plus:
-    pd_v1->set_ev(pd_v1->coerce(EV_double));
-    if (pd_v1->ev() == NULL)
-      return NULL;
-    retval->u.dval = pd_v1->ev()->u.dval;
+    retval->u.lval = pd_v1->ev()->u.lval;
     break;
   case EC_u_minus:
-    pd_v1->set_ev(pd_v1->coerce(EV_double));
-    if (pd_v1->ev() == NULL)
-      return NULL;
-    retval->u.dval = -(pd_v1->ev()->u.dval);
+    retval->u.lval = -(pd_v1->ev()->u.lval);
     break;
   case EC_bit_neg:
     pd_v1->set_ev(pd_v1->coerce(EV_long));
     if (pd_v1->ev() == NULL)
       return NULL;
-    retval->u.dval = ~pd_v1->ev()->u.lval;
+    retval->u.lval = ~pd_v1->ev()->u.lval;
     break;
   default:
     return NULL;
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index 7f846c3073a..f4ed7831349 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -108,18 +108,6 @@ AST_Module::AST_Module(UTL_ScopedName *n, UTL_StrList *p)
 
       this->fe_add_predefined_type (pdt);
 
-      pdt = idl_global->gen ()->create_predefined_type (
-                                  AST_PredefinedType::PT_pseudo,
-                                  new UTL_ScopedName (
-                                    new Identifier ("TCKind",
-                                                    1,
-                                                    0,
-                                                    I_FALSE),
-                                    NULL),
-                                  NULL);
-
-      this->fe_add_predefined_type (pdt);
-
 # ifdef IDL_HAS_VALUETYPE
       if (idl_global->obv_support ())
         {
diff --git a/TAO/TAO_IDL/be/Makefile.am b/TAO/TAO_IDL/be/Makefile.am
index 67b85a70c01..0ef64553405 100644
--- a/TAO/TAO_IDL/be/Makefile.am
+++ b/TAO/TAO_IDL/be/Makefile.am
@@ -39,6 +39,7 @@ libbe_a_SOURCES = \
          be_module.cpp  \
          be_native.cpp  \
          be_operation.cpp  \
+         be_operation_ami.cpp  \
          be_predefined_type.cpp  \
          be_produce.cpp  \
          be_root.cpp  \
@@ -68,6 +69,7 @@ libbe_a_SOURCES = \
          be_visitor_interface_fwd.cpp  \
          be_visitor_module.cpp  \
          be_visitor_operation.cpp  \
+         be_visitor_operation_ami.cpp \
          be_visitor_root.cpp  \
          be_visitor_scope.cpp  \
          be_visitor_sequence.cpp  \
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 26d1765a64b..4736951d323 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -278,10 +278,8 @@ TAO_CodeGen::start_client_stubs (const char *fname)
   *this->client_stubs_ << "#include \"" <<
     idl_global->be_get_client_hdr_fname (1) << "\"\n\n";
 
-#if 0 // Nanbor's collocation change
   *this->client_stubs_ << "#include \"" <<
     idl_global->be_get_server_hdr_fname (1) << "\"\n\n";
-#endif /* Nanbor */
 
   // generate the code that includes the inline file if not included in the
   // header file
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
index b5de42eebde..335301785f5 100644
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ b/TAO/TAO_IDL/be/be_enum.cpp
@@ -82,32 +82,6 @@ be_enum::member_count (void)
   return this->member_count_;
 }
 
-// Convert a numeric value to the string name
-UTL_ScopedName *
-be_enum::value_to_name (const unsigned long v)
-{
-  UTL_ScopeActiveIterator *iter;
-  AST_EnumVal             *item;
-  AST_Decl		            *i;
-
-  iter = new UTL_ScopeActiveIterator (this, 
-                                      IK_decls);
-
-  while (!iter->is_done ()) 
-    {
-      i = iter->item  ();
-      item = AST_EnumVal::narrow_from_decl (i);
-      if (item->constant_value  ()->ev ()->u.ulval == v) 
-        {
-          delete iter;
-          return item->name ();
-        }
-      iter->next ();
-    }
-  delete iter;
-  return NULL;
-}
-
 int
 be_enum::accept (be_visitor *visitor)
 {
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index f2d84c938ad..26b9ed29d28 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -351,18 +351,27 @@ be_interface::gen_def_ctors_helper (be_interface* node, be_interface* base, TAO_
 }
 
 
-// generate the var definition
+// generate the var definition. If <interface_name> is not 0, generate
+// the var defn for that name. Otherwise, do it for the interface you
+// are visiting (this).
 int
-be_interface::gen_var_defn (void)
+be_interface::gen_var_defn (char* interface_name)
 {
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
+  TAO_OutStream *ch;           // output stream
+  TAO_NL  nl;                  // end line
   char namebuf [NAMEBUFSIZE];  // names
 
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
+  // Decide which name to use.
+  if (interface_name == 0)
+    interface_name = this->local_name ()->get_string ();
 
-  // retrieve a singleton instance of the code generator
+  // Buffer with name of the var class.
+  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
+  ACE_OS::sprintf (namebuf,
+                   "%s_var",
+                   interface_name);
+  
+  // Retrieve a singleton instance of the code generator
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
 
   ch = cg->client_header ();
@@ -380,7 +389,7 @@ be_interface::gen_var_defn (void)
 
   // default constr
   *ch << namebuf << " (void); // default constructor" << nl;
-  *ch << namebuf << " (" << local_name () << "_ptr);" << nl;
+  *ch << namebuf << " (" << interface_name << "_ptr);" << nl;
 
   // copy constructor
   *ch << namebuf << " (const " << namebuf <<
@@ -391,31 +400,31 @@ be_interface::gen_var_defn (void)
   *ch << nl;
 
   // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
+  *ch << namebuf << " &operator= (" << interface_name << "_ptr);" << nl;
 
   // assignment from _var
   *ch << namebuf << " &operator= (const " << namebuf <<
     " &);" << nl;
 
   // arrow operator
-  *ch << local_name () << "_ptr operator-> (void) const;" << nl;
+  *ch << interface_name << "_ptr operator-> (void) const;" << nl;
 
   *ch << nl;
 
   // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << "_ptr &() const;" << nl;
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
+  *ch << "operator const " << interface_name << "_ptr &() const;" << nl;
+  *ch << "operator " << interface_name << "_ptr &();" << nl;
 
   *ch << "// in, inout, out, _retn " << nl;
   // the return types of in, out, inout, and _retn are based on the parameter
   // passing rules and the base type
-  *ch << local_name () << "_ptr in (void) const;" << nl;
-  *ch << local_name () << "_ptr &inout (void);" << nl;
-  *ch << local_name () << "_ptr &out (void);" << nl;
-  *ch << local_name () << "_ptr _retn (void);" << nl;
+  *ch << interface_name << "_ptr in (void) const;" << nl;
+  *ch << interface_name << "_ptr &inout (void);" << nl;
+  *ch << interface_name << "_ptr &out (void);" << nl;
+  *ch << interface_name << "_ptr _retn (void);" << nl;
 
   // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << "_ptr ptr (void) const;\n";
+  *ch << interface_name << "_ptr ptr (void) const;\n";
 
   *ch << "\n";
   ch->decr_indent ();
@@ -423,7 +432,7 @@ be_interface::gen_var_defn (void)
   // private
   *ch << "private:\n";
   ch->incr_indent ();
-  *ch << local_name () << "_ptr ptr_;\n";
+  *ch << interface_name << "_ptr ptr_;\n";
 
   ch->decr_indent ();
   *ch << "};\n\n";
@@ -431,21 +440,33 @@ be_interface::gen_var_defn (void)
   return 0;
 }
 
-// implementation of the _var class. All of these get generated in the inline
-// file
+// implementation of the _var class. All of these get generated in the
+// inline file. 
+// If the argument is 0, then use the name in <this>, otherwise use
+// the name given. Just making the class more useful.
 int
-be_interface::gen_var_impl (void)
+be_interface::gen_var_impl (char *interface_local_name,
+                            char *interface_full_name)
 {
   TAO_OutStream *ci; // output stream
   TAO_NL  nl;        // end line
   char fname [NAMEBUFSIZE];  // to hold the full and
   char lname [NAMEBUFSIZE];  // local _var names
 
+  // Decide on the names to use. 
+  // Even if one argument is 0, there is no point using the
+  // arguments. Let us then use the name in this node.
+  if (interface_local_name == 0 || interface_full_name == 0)
+    {
+      interface_local_name = local_name ()->get_string ();
+      interface_full_name = (char *) this->fullname ();
+    }
+
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_var", interface_full_name);
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
+  ACE_OS::sprintf (lname, "%s_var", interface_local_name);
 
   // retrieve a singleton instance of the code generator
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
@@ -453,8 +474,8 @@ be_interface::gen_var_impl (void)
   ci = cg->client_inline ();
 
   // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
+  // Depending upon the data type, there are some differences which we
+  // account for over here.
 
   ci->indent (); // start with whatever was our current indent level
 
@@ -467,13 +488,13 @@ be_interface::gen_var_impl (void)
   *ci << "ACE_INLINE" << nl;
   *ci << fname << "::" << lname <<
     " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (" << this->name () << "::_nil ())" << nl;
+  *ci << "  " << ": ptr_ (" << interface_full_name << "::_nil ())" << nl;
   *ci << "{}\n\n";
 
   // constr from a _ptr
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr p)" << nl;
+  *ci << fname << "::" << lname << " (" << interface_full_name << "_ptr p)" << nl;
   *ci << "  : ptr_ (p)" << nl;
   *ci << "{}\n\n";
 
@@ -482,7 +503,7 @@ be_interface::gen_var_impl (void)
   // constructor because this inline function is used elsewhere. Hence to make
   // inlining of this function possible, we must define it before its use.
   ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
+  *ci << "ACE_INLINE " << interface_full_name << "_ptr " << nl;
   *ci << fname << "::ptr (void) const" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -495,7 +516,7 @@ be_interface::gen_var_impl (void)
   *ci << "ACE_INLINE" << nl;
   *ci << fname << "::" << lname << " (const " << fname <<
     " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (" << name () << "::_duplicate (p.ptr ()))" << nl;
+  *ci << "  : ptr_ (" << interface_full_name << "::_duplicate (p.ptr ()))" << nl;
   *ci << "{}\n\n";
 
   // destructor
@@ -511,7 +532,7 @@ be_interface::gen_var_impl (void)
   // assignment operator
   ci->indent ();
   *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
+  *ci << fname << "::operator= (" << interface_full_name <<
     "_ptr p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -542,7 +563,7 @@ be_interface::gen_var_impl (void)
   // other extra methods - cast operator ()
   ci->indent ();
   *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
+  *ci << fname << "::operator const " << interface_full_name <<
     "_ptr &() const // cast" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -552,7 +573,7 @@ be_interface::gen_var_impl (void)
 
   ci->indent ();
   *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_ptr &() // cast " << nl;
+  *ci << fname << "::operator " << interface_full_name << "_ptr &() // cast " << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "return this->ptr_;\n";
@@ -561,7 +582,7 @@ be_interface::gen_var_impl (void)
 
   // operator->
   ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
+  *ci << "ACE_INLINE " << interface_full_name << "_ptr " << nl;
   *ci << fname << "::operator-> (void) const" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -571,7 +592,7 @@ be_interface::gen_var_impl (void)
 
   // in, inout, out, and _retn
   ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr" << nl;
+  *ci << "ACE_INLINE " << interface_full_name << "_ptr" << nl;
   *ci << fname << "::in (void) const" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -580,7 +601,7 @@ be_interface::gen_var_impl (void)
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
+  *ci << "ACE_INLINE " << interface_full_name << "_ptr &" << nl;
   *ci << fname << "::inout (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -589,24 +610,24 @@ be_interface::gen_var_impl (void)
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
+  *ci << "ACE_INLINE " << interface_full_name << "_ptr &" << nl;
   *ci << fname << "::out (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
+  *ci << "this->ptr_ = " << interface_full_name << "::_nil ();" << nl;
   *ci << "return this->ptr_;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
 
   ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
+  *ci << "ACE_INLINE " << interface_full_name << "_ptr " << nl;
   *ci << fname << "::_retn (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "// yield ownership of managed obj reference" << nl;
-  *ci << this->name () << "_ptr val = this->ptr_;" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
+  *ci << interface_full_name << "_ptr val = this->ptr_;" << nl;
+  *ci << "this->ptr_ = " << interface_full_name << "::_nil ();" << nl;
   *ci << "return val;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
@@ -614,18 +635,27 @@ be_interface::gen_var_impl (void)
   return 0;
 }
 
-// generate the _out definition
+// Generate the out definition. If <interface_name> is not 0, generate
+// the out defn for that name. Otherwise, do it for the interface you
+// are visiting (this).
 int
-be_interface::gen_out_defn (void)
+be_interface::gen_out_defn (char *interface_name)
 {
   TAO_OutStream *ch; // output stream
   TAO_NL  nl;        // end line
   char namebuf [NAMEBUFSIZE];  // to hold the _out name
+  
+  // Decide which name to use.
+  if (interface_name == 0)
+    interface_name = this->local_name ()->get_string ();
 
+  // Create the buffer with the name of the out class.
   ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
+  ACE_OS::sprintf (namebuf,
+                   "%s_out",
+                   interface_name);
 
-  // retrieve a singleton instance of the code generator
+  // Retrieve a singleton instance of the code generator
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
 
   ch = cg->client_header ();
@@ -642,9 +672,9 @@ be_interface::gen_out_defn (void)
   // No default constructor
 
   // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << "_ptr &);" << nl;
+  *ch << namebuf << " (" << interface_name << "_ptr &);" << nl;
   // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
+  *ch << namebuf << " (" << interface_name << "_var &);" << nl;
   // constructor from a _out &
   *ch << namebuf << " (const " << namebuf << " &);" << nl;
   // assignment operator from a _out &
@@ -652,39 +682,52 @@ be_interface::gen_out_defn (void)
   // assignment operator from a pointer &, cast operator, ptr fn, operator
   // -> and any other extra operators
   // only interface allows assignment from var &
-  *ch << namebuf << " &operator= (const " << local_name () << "_var &);" << nl;
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
+  *ch << namebuf << " &operator= (const " << interface_name << "_var &);" << nl;
+  *ch << namebuf << " &operator= (" << interface_name << "_ptr);" << nl;
   // cast
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
+  *ch << "operator " << interface_name << "_ptr &();" << nl;
   // ptr fn
-  *ch << local_name () << "_ptr &ptr (void);" << nl;
+  *ch << interface_name << "_ptr &ptr (void);" << nl;
   // operator ->
-  *ch << local_name () << "_ptr operator-> (void);" << nl;
+  *ch << interface_name << "_ptr operator-> (void);" << nl;
 
   *ch << "\n";
   ch->decr_indent ();
   *ch << "private:\n";
   ch->incr_indent ();
-  *ch << local_name () << "_ptr &ptr_;\n";
+  *ch << interface_name << "_ptr &ptr_;\n";
 
   ch->decr_indent ();
   *ch << "};\n\n";
   return 0;
 }
 
+
+// Generate the out class definition. If <interface_name> is not 0,
+// generate the out defn for that name. Otherwise, do it for the
+// interface you are visiting (this).
 int
-be_interface::gen_out_impl (void)
+be_interface::gen_out_impl (char *interface_local_name,
+                            char *interface_full_name)
 {
   TAO_OutStream *ci; // output stream
   TAO_NL  nl;        // end line
   char fname [NAMEBUFSIZE];  // to hold the full and
   char lname [NAMEBUFSIZE];  // local _out names
 
+  // Even if one argument is 0, there is no point using the
+  // arguments. Let us then use the name in this node.
+  if (interface_local_name == 0 || interface_full_name == 0)
+    {
+      interface_local_name = local_name ()->get_string ();
+      interface_full_name = (char *) this->fullname ();
+    }
+  
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
+  ACE_OS::sprintf (fname, "%s_out", interface_full_name);
 
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
+  ACE_OS::sprintf (lname, "%s_out", interface_local_name);
 
   // retrieve a singleton instance of the code generator
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
@@ -705,24 +748,24 @@ be_interface::gen_out_impl (void)
       // constr from a _ptr
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr &p)" << nl;
+  *ci << fname << "::" << lname << " (" << interface_full_name << "_ptr &p)" << nl;
   *ci << "  : ptr_ (p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
+  *ci << "this->ptr_ = " << interface_full_name << "::_nil ();\n";
   ci->decr_indent ();
   *ci << "}\n\n";
 
   // constructor from _var &
   ci->indent ();
   *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
+  *ci << fname << "::" << lname << " (" << interface_full_name <<
     "_var &p) // constructor from _var" << nl;
   *ci << "  : ptr_ (p.out ())" << nl;
   *ci << "{\n";
   ci->incr_indent ();
   *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
+  *ci << "this->ptr_ = " << interface_full_name << "::_nil ();\n";
   ci->decr_indent ();
   *ci << "}\n\n";
 
@@ -749,11 +792,11 @@ be_interface::gen_out_impl (void)
       // assignment operator from _var
   ci->indent ();
   *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << this->name () <<
+  *ci << fname << "::operator= (const " << interface_full_name <<
     "_var &p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_duplicate (p.ptr ());" << nl;
+  *ci << "this->ptr_ = " << interface_full_name << "::_duplicate (p.ptr ());" << nl;
   *ci << "return *this;\n";
   ci->decr_indent ();
   *ci << "}\n\n";
@@ -761,7 +804,7 @@ be_interface::gen_out_impl (void)
       // assignment operator from _ptr
   ci->indent ();
   *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
+  *ci << fname << "::operator= (" << interface_full_name <<
     "_ptr p)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -773,7 +816,7 @@ be_interface::gen_out_impl (void)
       // other extra methods - cast operator ()
   ci->indent ();
   *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
+  *ci << fname << "::operator " << interface_full_name <<
     "_ptr &() // cast" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -783,7 +826,7 @@ be_interface::gen_out_impl (void)
 
   // ptr function
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
+  *ci << "ACE_INLINE " << interface_full_name << "_ptr &" << nl;
   *ci << fname << "::ptr (void) // ptr" << nl;
   *ci << "{\n";
   ci->incr_indent ();
@@ -793,7 +836,7 @@ be_interface::gen_out_impl (void)
 
       // operator->
   ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
+  *ci << "ACE_INLINE " << interface_full_name << "_ptr " << nl;
   *ci << fname << "::operator-> (void)" << nl;
   *ci << "{\n";
   ci->incr_indent ();
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 8a5d3338cf0..05d705b9c4e 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -991,7 +991,7 @@ be_union::compute_default_value (void)
                           break;
                         case AST_Expression::EV_bool:
                           if (this->default_value_.u.bool_val 
-                              == expr->ev ()->u.bval)
+                              == (long) expr->ev ()->u.bval)
                             {
                               this->default_value_.u.bool_val++;
                               break_loop = 1;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument.cpp
index 82984108372..8e302bdcede 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument.cpp
@@ -38,6 +38,7 @@
 #include "be_visitor_argument/compiled_marshal_cs.cpp"
 #include "be_visitor_argument/compiled_marshal_ss.cpp"
 #include "be_visitor_argument/pre_invoke_cs.cpp"
+#include "be_visitor_argument/arglist_ami.cpp"
 
 ACE_RCSID(be, be_visitor_argument, "$Id$")
 
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index 0463198b3b8..69e658134da 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -69,7 +69,7 @@ int be_visitor_args_arglist::visit_argument (be_argument *node)
                         -1);
     }
 
-  *os << " " << node->local_name ();
+  *os << " " << node->local_name () << ",\n";
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist_ami.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist_ami.cpp
new file mode 100644
index 00000000000..12e485067a0
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist_ami.cpp
@@ -0,0 +1,321 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates the parameters in an Operation signature
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#include "idl.h"
+#include "be.h"
+#include "be_visitor_argument.h"
+
+ACE_RCSID(be_visitor_argument, arglist_ami, "$Id$")
+
+
+// ************************************************************
+// be_visitor_args_arglist for parameter list in method declarations and
+// definitions for AMI stubs.
+// ************************************************************
+
+be_visitor_args_arglist_ami::be_visitor_args_arglist_ami (be_visitor_context *ctx)
+  : be_visitor_args (ctx)
+{
+}
+
+be_visitor_args_arglist_ami::~be_visitor_args_arglist_ami (void)
+{
+}
+
+int
+be_visitor_args_arglist_ami::visit_argument (be_argument *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  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_arglist::"
+                         "visit_argument - "
+                         "Bad argument type\n"),
+                        -1);
+    }
+
+  os->indent (); // start with current indentation level
+
+  // Different types have different mappings when used as in/out or
+  // inout parameters. Let this visitor deal with the type
+
+  int result = bt->accept (this);
+  if (result == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_arglist::"
+                         "visit_argument - "
+                         "cannot accept visitor\n"),
+                        -1);
+    }
+  
+  // Print the variable name only if the type was printed already. 
+  if (result)
+    *os << " " << node->local_name () << ",\n";
+
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::visit_array (be_array *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+  
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      *os << "const " << this->type_name (node);
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::visit_enum (be_enum *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      *os << this->type_name (node);
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::visit_interface (be_interface *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT: // inout
+      *os << this->type_name (node, "_ptr");
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::visit_interface_fwd (be_interface_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT: // inout
+      *os << this->type_name (node, "_ptr");
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::visit_native (be_native *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get output stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      *os << this->type_name (node);
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::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)
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
+          *os << "const " << this->type_name (node) << " &";
+          return 1;
+          /* NOT REACHED */
+        }
+    }
+  else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
+          *os << this->type_name (node, "_ptr");
+          return 1;
+          /* NOT REACHED */
+        } // end switch direction
+    } // end else if
+  else // simple predefined types
+    {
+      switch (this->direction ())
+        {
+        case AST_Argument::dir_IN:
+        case AST_Argument::dir_INOUT:
+          *os << this->type_name (node);
+          return 1;
+          /* NOT REACHED */
+        } // end switch direction
+    } // end of else
+
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::visit_sequence (be_sequence *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      *os << "const " << this->type_name (node) << " &";
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::visit_string (be_string *)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      *os << "const char *";
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::visit_structure (be_structure *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      *os << "const " << this->type_name (node) << " &";
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int be_visitor_args_arglist_ami::visit_union (be_union *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      *os << "const " << this->type_name (node) << " &";
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int be_visitor_args_arglist_ami::visit_typedef (be_typedef *node)
+{
+  this->ctx_->alias (node);
+  
+  int result = node->primitive_base_type ()->accept (this);
+  if (result == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_args_arglist_ami::"
+                         "visit_typedef - "
+                         "accept on primitive type failed\n"),
+                        -1);
+    }
+
+  this->ctx_->alias (0);
+
+  return result;
+}
+
+
+#ifdef IDL_HAS_VALUETYPE
+
+int
+be_visitor_args_arglist_ami::visit_valuetype (be_valuetype *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      *os << this->type_name (node) << " *";
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+int
+be_visitor_args_arglist_ami::visit_valuetype_fwd (be_valuetype_fwd *node)
+{
+  TAO_OutStream *os = this->ctx_->stream (); // get the stream
+  
+  switch (this->direction ())
+    {
+    case AST_Argument::dir_IN:
+    case AST_Argument::dir_INOUT:
+      *os << "const " << this->type_name (node) << " *";
+      return 1;
+      /* NOT REACHED */
+    }
+  return 0;
+}
+
+#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index 8a43593f058..dc24f416080 100644
--- a/TAO/TAO_IDL/be/be_visitor_factory.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp
@@ -232,6 +232,28 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
 
 #   endif /* IDL_HAS_VALUETYPE */
 
+    case TAO_CodeGen::TAO_OPERATION_AMI_CH:
+      return new be_visitor_operation_ami_ch (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_AMI:
+      return new be_visitor_operation_arglist_ami (new_ctx);
+      
+    case TAO_CodeGen::TAO_OPERATION_ARG_AMI:
+      return new be_visitor_operation_argument (new_ctx);
+      
+    case TAO_CodeGen::TAO_ARGUMENT_AMI:
+      // @@ I am not sure about this case, yet (Alex).     
+      return new be_visitor_decl (new_ctx); // noop
+
+    case TAO_CodeGen::TAO_ARGUMENT_ARGLIST_AMI:
+      return new be_visitor_args_arglist_ami (new_ctx);
+
+    case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CH:
+      return new be_visitor_ami_handler_fwd_ch (new_ctx);
+      
+    case TAO_CodeGen::TAO_AMI_HANDLER_FWD_CI:
+      return new be_visitor_ami_handler_fwd_ci (new_ctx);
+
     case TAO_CodeGen::TAO_STRUCT_CH:
       return new be_visitor_structure_ch (new_ctx);
     case TAO_CodeGen::TAO_STRUCT_CS:
@@ -474,6 +496,10 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_operation_ch (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_CS:
       return new be_interpretive_visitor_operation_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_AMI_CS:
+      return new be_interpretive_visitor_operation_ami_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_SH:
       return new be_visitor_operation_sh (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_IH:
@@ -597,6 +623,10 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_operation_ch (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_CS:
       return new be_compiled_visitor_operation_cs (new_ctx);
+
+    case TAO_CodeGen::TAO_OPERATION_AMI_CS:
+      return new be_compiled_visitor_operation_ami_cs (new_ctx);
+
     case TAO_CodeGen::TAO_OPERATION_SH:
       return new be_visitor_operation_sh (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_SS:
@@ -639,8 +669,8 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       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:
-        case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS:
       return new be_visitor_operation_arglist (new_ctx);
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 ba52f1c1eb0..abd9059367f 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -487,14 +487,14 @@ be_visitor_field_ch::visit_union (be_union *node)
       ctx.node (node); // set the node to be the node being visited. The scope
                        // is still the same
 
-      // first generate the union declaration
-      ctx.state (TAO_CodeGen::TAO_UNION_CH);
+      // first generate the enum declaration
+      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
       be_visitor *visitor = tao_cg->make_visitor (&ctx);
       if (!visitor)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_ch::"
-                             "visit_union - "
+                             "visit_enum - "
                              "Bad visitor\n"
                              ), -1);
         }
@@ -502,7 +502,7 @@ be_visitor_field_ch::visit_union (be_union *node)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_ch::"
-                             "visit_union - "
+                             "visit_enum - "
                              "codegen failed\n"
                              ), -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
index 57d2daa7690..c97f3f071ec 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
@@ -237,7 +237,7 @@ be_visitor_field_ci::visit_union (be_union *node)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_ci::"
-                             "visit_union - "
+                             "visit_struct - "
                              "Bad visitor\n"
                              ), -1);
         }
@@ -245,7 +245,7 @@ be_visitor_field_ci::visit_union (be_union *node)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_field_ci::"
-                             "visit_union - "
+                             "visit_struct - "
                              "codegen failed\n"
                              ), -1);
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index bf02a0675fc..458b9939b27 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -41,5 +41,6 @@
 #include "be_visitor_interface/cdr_op_ch.cpp"
 #include "be_visitor_interface/cdr_op_ci.cpp"
 #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"
 ACE_RCSID(be, be_visitor_interface, "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp
new file mode 100644
index 00000000000..0e5a8cb8c6f
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ch.cpp
@@ -0,0 +1,127 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_fwd_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating fwd declaration code for the AMI Handler
+//    interface.
+//
+// = 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_fwd.h"
+
+ACE_RCSID(be_visitor_ami_handler_fwd, ami_handler_fwd_ch, "$Id$")
+
+
+// ********************************************************************
+// Visitor implementation generating fwd declaration code for the AMI
+// Handler interface.
+// ********************************************************************
+  
+be_visitor_ami_handler_fwd_ch::be_visitor_ami_handler_fwd_ch (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+be_visitor_ami_handler_fwd_ch::~be_visitor_ami_handler_fwd_ch (void)
+{
+}
+
+// visit the interface node and its scope
+int
+be_visitor_ami_handler_fwd_ch::visit_interface (be_interface *node)
+{
+  // Grab the out stream.
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // Generate code, if the client header is not generated already.
+  if (!node->cli_hdr_gen () && !node->imported ())
+    {
+      // start from the current indentation.
+      os->indent ();
+
+      // Generate forward declaration class.
+      *os << "class "
+          << "AMI_" << node->local_name () << "_Handler" << ";"
+          << be_nl;
+      
+      // Create a string "AMI_<interface name>_Handler". We can use
+      // this for defining all _Var, _out,etc.
+      char *interface_name = 0;
+      ACE_NEW_RETURN (interface_name,
+                      char [ACE_OS::strlen ("AMI_") +
+                           ACE_OS::strlen (node->flatname ()) + 
+                           ACE_OS::strlen ("_Handler") +
+                           // end of string
+                           1],
+                      0);
+      ACE_OS::sprintf (interface_name,
+                       "AMI_%s_Handler",
+                       node->flatname ());
+
+      // Generate the ifdefined macro for the _ptr type.
+      os->gen_ifdef_macro (interface_name, "_ptr");
+
+      // Generate the _ptr declaration
+      *os << "typedef "
+          << "AMI_" << node->local_name () << "_Handler"
+          << " *"
+          << "AMI_" << node->local_name () << "_Handler" << "_ptr;"
+          << be_nl;
+
+      // Generate the endif.
+      os->gen_endif ();
+      
+      // Generate the var class.
+      
+      // Enclose under an ifdef macro
+      os->gen_ifdef_macro (interface_name, "_var");
+      
+      // Generate the _var declaration.
+      if (node->gen_var_defn (interface_name) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_ami_handler_fwd_ch::"
+                             "visit_interface_fwd - "
+                             "codegen for _var failed\n"), -1);
+        }
+      
+      // Gen an endif.
+      os->gen_endif ();
+
+      // Generate the our class.
+
+      // Enclose under an ifdef macro.
+      os->gen_ifdef_macro (interface_name, "_out");
+
+      // Generate the _out declaration - ORBOS/97-05-15 pg 16-20
+      // spec. 
+      if (node->gen_out_defn (interface_name) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_ami_handler_fwd_ch::"
+                             "visit_interface_fwd - "
+                             "codegen for _out failed\n"), -1);
+        }
+
+      // Generate the endif macro.
+      os->gen_endif ();
+    }
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp
new file mode 100644
index 00000000000..02e8904d29f
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_fwd_ci.cpp
@@ -0,0 +1,166 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_fwd_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Ami_<Interface>_Handler node in the
+//    client inline.  
+//
+// = 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_fwd.h"
+
+ACE_RCSID(be_visitor_ami_handler_fwd, ami_handler_fwd_ci, "$Id$")
+
+
+// ********************************************************************
+// Visitor implementation for the Ami_Handler_Fwd type
+// This one for the client inline file
+// ********************************************************************
+
+be_visitor_ami_handler_fwd_ci::be_visitor_ami_handler_fwd_ci (be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+be_visitor_ami_handler_fwd_ci::~be_visitor_ami_handler_fwd_ci (void)
+{
+}
+
+// visit the Ami_Handler_Fwd_ci node and its scope
+int
+be_visitor_ami_handler_fwd_ci::visit_interface (be_interface *node)
+{
+  if (node->cli_inline_gen () || node->imported ())
+    return 0;
+
+  // Generate code.
+
+  // Get the out stream.
+  TAO_OutStream *os;
+  os = this->ctx_->stream ();
+  
+  // Start from the current indentation level.
+  os->indent ();
+
+  // Create the full name and local name for the AMI_<Interface
+  // name>_Handler interface.
+  char *full_name = 0;
+  char *local_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 ());
+
+  // Local name.
+
+  ACE_NEW_RETURN (local_name,
+                  char [ACE_OS::strlen ("AMI_") +
+                       ACE_OS::strlen (node->local_name ()->get_string ()) +
+                       ACE_OS::strlen ("_Handler") +
+                       1],
+                  -1);
+  
+  ACE_OS::sprintf (local_name,
+                   "AMI_%s_Handler",
+                   node->local_name ()->get_string ());
+
+  // Generate the constructors and destructor.
+
+  *os << "ACE_INLINE" << be_nl;
+  *os << full_name << "::" << local_name 
+      << " (void) // default constructor" << be_nl;
+  *os << "{}" << be_nl << be_nl;
+
+  *os << "ACE_INLINE" << be_nl;
+  *os << full_name << "::" << local_name
+      << " (TAO_Stub *objref, TAO_ServantBase *_tao_servant, "
+      << "CORBA::Boolean _tao_collocated) // constructor"
+      << be_nl
+      << "  : CORBA_Object (objref, _tao_servant, _tao_collocated)"
+      << be_nl
+      << "{}" << be_nl << be_nl;
+
+  *os << "ACE_INLINE" << be_nl;
+  *os << full_name << "::~" << local_name
+      << " (void) // destructor" << be_nl
+      << "{}\n\n";
+
+  // _nil method.
+  *os << "ACE_INLINE "
+      << full_name << "_ptr" << be_nl
+      << full_name << "::_nil (void)" << be_nl
+      << "{" << be_idt_nl
+      << "return (" << full_name << "_ptr)0;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  // Generate the ifdefined macro for  the _var type.
+  os->gen_ifdef_macro (full_name, "_var");
+  if (node->gen_var_impl (full_name, local_name) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface_ci::"
+                         "visit_interface - "
+                         "codegen for _var failed\n"), -1);
+    }
+  os->gen_endif ();
+
+  // Generate the ifdefined macro for  the _out type.
+  os->gen_ifdef_macro (full_name, "_out");
+  if (node->gen_out_impl (full_name,
+                          local_name) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface_ci::"
+                         "visit_interface - "
+                         "codegen for _out failed\n"), -1);
+    }
+  os->gen_endif ();
+
+  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 e56524b2b25..11e4f71678d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -451,10 +451,61 @@ be_visitor_interface::visit_operation (be_operation *node)
                          ),  -1);
     }
   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.
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_INTERFACE_CH:
+      ctx.state (TAO_CodeGen::TAO_OPERATION_AMI_CH);
+      break;
+
+    case TAO_CodeGen::TAO_INTERFACE_CS:
+      ctx.state (TAO_CodeGen::TAO_OPERATION_AMI_CS);
+      break;
+
+    default:
+      // We dont have to do anything for the other cases.
+      return 0;
+    }
+      
+  // Grab the appropriate visitor
+  visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface::"
+                         "visit_operation - "
+                         "NUL visitor\n"),
+                        -1);
+    }
+          
+  // Visit the node using this visitor
+  if (node->accept (visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface::"
+                         "visit_operation - "
+                         "failed to accept visitor\n"),
+                        -1);
+    }
+  delete visitor;
+  
   return 0;
 }
 
-// visit an structure
+// Visit an structure.
 int
 be_visitor_interface::visit_structure (be_structure *node)
 {
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 89f264d9671..3fb87be9206 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -49,11 +49,46 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   if (!node->cli_hdr_gen () && !node->imported ()) // not already generated and
                                                    // not imported
     {
-
+      // Generate the AMI Reply Handler's forward declaration code, if
+      // the option is enabled, for this interface.
+      
+      if (idl_global->ami_call_back () == I_TRUE)
+        {
+          // Set the context.
+          be_visitor_context ctx (*this->ctx_);
+          
+          // Set the state.
+          ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_FWD_CH);
+          
+          // Create the visitor.
+          be_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)
+            {
+              delete visitor;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_interface_ch::"
+                                 "visit_interface - "
+                                 "code gen for ami handler fwd failed\n"),
+                                -1);
+            }
+          delete visitor;
+        }
+      
+      // Grab the stream.
       os = this->ctx_->stream ();
-
+      
       // == STEP 1:  generate the class name and class names we inherit ==
-
+      
       // generate the ifdefined macro for  the _ptr type
       os->gen_ifdef_macro (node->flatname (), "_ptr");
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index e10d6c3e58c..3db747bd0ea 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -99,7 +99,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
     }
   os->gen_endif ();
 
-  // generate inline methods for elements of our scope
+  // Generate inline methods for elements of our scope
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -108,5 +108,40 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
                          "codegen for scope failed\n"), -1);
     }
 
+  // If AMI is enabled, generate all the inline stuff for the
+  // AMI_<interface_name>_Handler interface.
+
+  if (idl_global->ami_call_back () == I_TRUE)
+    {
+      // Set the context.
+      be_visitor_context ctx (*this->ctx_);
+      
+      // Set the state.
+      ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_FWD_CI);
+      
+      // Create the visitor.
+      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_ci::"
+                             "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_ch::"
+                             "visit_interface - "
+                             "code gen for ami handler fwd failed\n"),
+                            -1);
+        }
+      delete visitor;
+    }
+
   return 0;
 }
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 a3e5db92568..41e5c6cb922 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -80,7 +80,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   *os << node->name () << "_ptr " << node->name ()
       << "::_unchecked_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
@@ -92,29 +92,17 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   *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)
-      << node->name () << "_ptr retv = ACE_reinterpret_cast (" << be_idt << be_idt_nl
-      << node->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
+      << node->repoID () << "\");" << be_uidt_nl;
+
+  *os << "if (servant == 0)" << be_idt_nl
+      << "return new " << node->name () << "(stub);" << be_uidt_nl;
+
+  *os << "return new "
+      << coll_name << "(" << be_idt << be_idt_nl
+      << "ACE_reinterpret_cast(" << skel_name
+      << "_ptr, servant)," << 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 " << node->name () << "(stub);" << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // The _duplicate method
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 c6e2dcdd647..15b60a36d95 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -130,6 +130,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << ");\n" << be_uidt_nl;
 
   // add a skeleton for our _non_existent method
+  os->indent ();
   *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
       << "CORBA::ServerRequest &req," << be_nl
       << "void *obj," << be_nl
@@ -155,16 +156,11 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
-  // the _interface_repository_id method.
+  // the _interface_repository_id method
   *os << "virtual const char* _interface_repository_id "
-      << "(void) const;\n\n";
+      << "(void) const;" << be_uidt_nl;
 
-  // 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).
+  // generate code for elements in the scope (e.g., operations)
   if (this->visit_scope (node) ==  -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -175,7 +171,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
     }
 
   // generate skeletons for operations of our base classes. These skeletons
-  // just cast the pointer to the appropriate type before invoking the call.
+  // 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,
@@ -185,8 +181,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                         -1);
     }
 
-
-  *os << be_uidt_nl << "};\n\n";
+  *os << "};\n\n";
 
   // generate the collocated class
   be_visitor_context ctx (*this->ctx_);
@@ -202,7 +197,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                         -1);
     }
 
-  // generate the TIE class.
+  // generate the TIE class
   ctx = *this->ctx_;
   ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SH);
   visitor = tao_cg->make_visitor (&ctx);
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 7ab84eeda93..45ec707fa93 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -212,7 +212,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "return 0;" << be_uidt << be_uidt << be_uidt_nl
       << "}\n\n";
 
-  // the downcast method.
   os->indent ();
   *os << "void* " << node->full_skel_name ()
       << "::_downcast (" << be_idt << be_idt_nl
@@ -283,25 +282,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     //      << "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;
+      << " (this, stub);" << be_uidt << be_nl;
 
   *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
-      << "if (!ACE_OS::strcmp (\"" << node->repoID ()
-      << "\", repository_id))" << be_idt_nl
-      << "return ACE_reinterpret_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
   be_visitor_context ctx (*this->ctx_);
   ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
index 18b5d80cb4c..14147f76b08 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
@@ -28,6 +28,5 @@
 #include "be_visitor_interface_fwd/interface_fwd_ch.cpp"
 #include "be_visitor_interface_fwd/interface_fwd_ci.cpp"
 #include "be_visitor_interface_fwd/cdr_op_ci.cpp"
-
 ACE_RCSID(be, be_visitor_interface_fwd, "$Id$")
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp
index 6e15900c125..a4fa8a7cf86 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp
@@ -54,6 +54,9 @@
 #include "be_visitor_operation/tie_si.cpp"
 #include "be_visitor_operation/compiled_marshal.cpp"
 #include "be_visitor_operation/rettype_pre_invoke_cs.cpp"
+#include "be_visitor_operation/operation_ami_ch.cpp"
+#include "be_visitor_operation/operation_ami_cs.cpp"
+#include "be_visitor_operation/arglist_ami.cpp"
 
 ACE_RCSID(be, be_visitor_operation, "$Id$")
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index c5aa14190dd..a1d6f6a1cd1 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -33,9 +33,9 @@ ACE_RCSID(be_visitor_operation, arglist, "$Id$")
 //   visitors to avoid code duplication and tight coupling
 // ************************************************************
 
-be_visitor_operation_arglist::
-be_visitor_operation_arglist (be_visitor_context *ctx)
-  : be_visitor_operation (ctx)
+be_visitor_operation_arglist::be_visitor_operation_arglist (be_visitor_context
+                                                            *ctx)
+  : be_visitor_scope (ctx)
 {
 }
 
@@ -60,59 +60,50 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
                         -1);
     }
 
-  // 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
-      if (node->argument_count () > 0)
-        *os << ",\n";
 
-      os->indent ();
-      switch (this->ctx_->state ())
-        {
-        case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
-        case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
-        case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
-          // 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_OPERATION_ARGLIST_IS:
-        case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
-          // last argument - is always CORBA::Environment
-          *os << "CORBA::Environment &ACE_TRY_ENV";
-          break;
-        default:
-          *os << "CORBA::Environment &ACE_TRY_ENV";
-          break;
-        }
-    }
-  *os << be_uidt_nl << ")" << be_uidt;
 
-  // now generate the throw specs
-  if (this->gen_throw_spec (node) == -1)
+  switch (this->ctx_->state ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_operation_arglist")
-                         ASYS_TEXT ("::visit_operation - ")
-                         ASYS_TEXT ("Failed to generate throw spec\n")),
-                        -1);
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
+      // last argument - is always CORBA::Environment
+      os->indent ();
+      *os << "CORBA::Environment &ACE_TRY_ENV";
+      *os << " = " << be_idt_nl
+	        << "TAO_default_environment ()"
+	        << be_uidt;
+      break;
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
+      // last argument - is always CORBA::Environment
+      os->indent ();
+      *os << "CORBA::Environment &ACE_TRY_ENV";
+      break;
+    default:
+      os->indent ();
+      *os << "CORBA::Environment &ACE_TRY_ENV";
+      break;
     }
+  *os << be_uidt_nl << ")" << be_uidt;
 
   switch (this->ctx_->state ())
     {
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
-      *os << ";\n\n";
+      *os << ";\n";
       break;
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
       // each method is pure virtual in the server header
-      *os << " = 0;\n\n";
+      *os << " = 0;\n";
+      break;
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
+      // each method is pure virtual in the server header
+      //*os << "\n\n";
       break;
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
+      // each method is pure virtual in the server header
+      break;
     default:
       *os << "\n";
     }
@@ -196,7 +187,6 @@ be_visitor_operation_arglist::visit_argument (be_argument *node)
       delete visitor;
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_arglist::"
-
                          "visit_argument - "
                          "codegen for arglist failed\n"),
                         -1);
@@ -204,19 +194,3 @@ be_visitor_operation_arglist::visit_argument (be_argument *node)
   delete visitor;
   return 0;
 }
-
-int
-be_visitor_operation_arglist::post_process (be_decl *bd)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // if we are not the last node in the list of arguments, generate a comma
-  // else decide if we are generating code to support true exceptions - in
-  // which case there will not be any CORBA::Environment parameter
-  if (!this->last_node (bd))
-    {
-      *os << ",\n";
-    }
-  return 0;
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist_ami.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist_ami.cpp
new file mode 100644
index 00000000000..47bbb778cbd
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist_ami.cpp
@@ -0,0 +1,176 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist_ami.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the parameter list of the Operation signature.
+//
+// = 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, arglist_ami, "$Id$")
+
+
+// ************************************************************
+//   operation visitor  to generate the argument list for the AMI
+//   stub. 
+//   We have separated code generation for this from the 4 main
+//   visitors to avoid code duplication and tight coupling
+  // ************************************************************
+  
+be_visitor_operation_arglist_ami::be_visitor_operation_arglist_ami (be_visitor_context
+                                                                    *ctx)
+  : be_visitor_scope (ctx)
+{
+}
+
+be_visitor_operation_arglist_ami::~be_visitor_operation_arglist_ami (void)
+{
+}
+
+int
+be_visitor_operation_arglist_ami::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os = this->ctx_->stream ();
+  
+  *os << " (" << be_idt << be_idt << "\n";
+
+  // #if defined (TAO_IDL_HAS_AMI)
+  // For the AMI, we need the Reply Handler as the first argument.
+
+  // start with current indentation level
+  os->indent ();
+
+  
+  be_decl *interface =
+    be_interface::narrow_from_scope (node->defined_in ())->decl ();
+  if (interface == 0)
+    cerr << "Invalid interface";
+
+  // AMI Handler argument.
+  *os << "AMI_"
+      << interface->fullname ()
+      << "_ptr "
+      << "ami_handler"
+      << ",\n";
+  // #endif /* TAO_IDL_HAS_AMI */
+
+  // all we do is hand over code generation to our scope
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_operation_arglist_ami::"
+                         "visit_operation - "
+                         "codegen for scope failed\n"),
+                        -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;
+  
+  // Done with the argument list.
+  *os << be_uidt_nl << ")" << be_uidt << "\n";
+  
+  return 0;
+}
+
+int
+be_visitor_operation_arglist_ami::visit_argument (be_argument *node)
+{
+  // Get the visitor that will dump the argument's mapping in the operation
+  // signature.
+  be_visitor_context ctx (*this->ctx_);
+
+  // First grab the interface definition inside which this operation is
+  // defined. We need this since argument types may very well be declared
+  // inside the scope of the interface node. In such cases, we would like to
+  // generate the appropriate relative scoped names.
+  be_operation *op = this->ctx_->be_scope_as_operation ();
+  if (!op)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist_ami::"
+                         "visit_argument - "
+                         "Bad operation\n"),
+                        -1);
+    }
+
+  // We need the interface node in which this operation was defined. However,
+  // if this operation node was an attribute node in disguise, we get this
+  // information from the context
+  be_interface *intf;
+  intf = this->ctx_->attribute ()
+    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
+    : be_interface::narrow_from_scope (op->defined_in ());
+
+  if (!intf)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist_ami::"
+                         "visit_argument - "
+                         "Bad interface\n"),
+                        -1);
+    }
+  ctx.scope (intf); // set new scope
+
+  switch (this->ctx_->state ())
+    {
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_AMI:
+      ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_AMI);
+      break;
+    default:
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_arglist_ami::"
+                           "visit_argument - "
+                           "Bad context\n"),
+                          -1);
+      }
+    }
+
+  // grab a visitor
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist_ami::"
+                         "visit_argument - "
+                         "Bad visitor\n"),
+                        -1);
+    }
+  if (node->accept (visitor) == -1)
+    {
+      delete visitor;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist_ami::"
+                         "visit_argument - "
+                         "codegen for arglist_ami failed\n"),
+                        -1);
+    }
+  delete visitor;
+  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 0a23dbcaa86..93cc4c0598d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -32,10 +32,9 @@ ACE_RCSID(be_visitor_operation, argument, "$Id$")
 // do_static_call/upcall stuff with arguments
 // ************************************************************
 
-be_visitor_operation_argument::
-be_visitor_operation_argument (be_visitor_context
-                               *ctx)
-  : be_visitor_operation (ctx)
+be_visitor_operation_argument::be_visitor_operation_argument (be_visitor_context
+                                                            *ctx)
+  : be_visitor_scope (ctx)
 {
 }
 
@@ -48,9 +47,6 @@ be_visitor_operation_argument::post_process (be_decl *bd)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // if we are not the last parameter, we insert a comma. This is only
-  // applicable for the upcalls or the call to (de)marshal that we use in the
-  // interpreted marshaling.
   if (!this->last_node (bd))
     {
       switch (this->ctx_->state ())
@@ -71,8 +67,6 @@ be_visitor_operation_argument::post_process (be_decl *bd)
 int
 be_visitor_operation_argument::visit_operation (be_operation *node)
 {
-  TAO_OutStream *os = this->ctx_->stream ();
-
   // all we do is hand over code generation to our scope
   if (this->visit_scope (node) == -1)
     {
@@ -83,28 +77,6 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
                         -1);
     }
 
-  // if we are supporting the alternate mapping, we must pass the
-  // CORBA::Environment parameter as the last parameter
-  if (!idl_global->exception_support ())
-    {
-      switch (this->ctx_->state ())
-        {
-        case TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS:
-        case TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS:
-          // applicable only to these cases where the actual upcall is made 
-
-          // last argument is the environment
-          if (node->argument_count () > 0)
-            // insert a comma only if there were previous parameters
-            *os << ",\n";
-          os->indent ();
-          *os << "ACE_TRY_ENV";
-          break;
-        default:
-          break;
-        }
-    }
-
   return 0;
 }
 
@@ -182,6 +154,9 @@ be_visitor_operation_argument::visit_argument (be_argument *node)
     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;
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
index c1fb75c62c1..135b06260cf 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
@@ -131,182 +131,35 @@ int be_visitor_operation_collocated_ss::visit_operation (be_operation *node)
   *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;
-
-  // Declare a return type
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_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) be_visitor_operation_collocated_ss::"
-                         "visit_operation - "
-                         "codegen for return var decl failed\n"),
-                        -1);
-    }
-
-  if (!this->void_return_type (bt))
-    {
-      os->indent ();
-      *os << "ACE_UNUSED_ARG (";
-      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_collocated_cs::"
-                             "gen_check_exception - "
-                             "codegen failed\n"),
-                            -1);
-        }
-      *os << ");\n";
-    }
-
-  os->indent ();
-  *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall ("
-      << be_idt << be_idt_nl
-      << "*this->_stubobj ()->servant_orb ()->orb_core ()->object_adapter ()"
-      << be_uidt_nl
-      << ");" << be_uidt_nl
-      << "servant_upcall.prepare_for_upcall (" << be_idt << be_idt_nl
-      << "this->_object_key ()," << be_nl
-      << "\"" << node->local_name () << "\"," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
-      << ");\n" << be_uidt;
-
-  // check if there is an exception
-  if (!idl_global->exception_support ())
-    if (this->gen_check_exception (bt) == -1)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_operation_collocated_ss::"
-                           "visit_operation - "
-                           "codegen for checking exception failed\n"),
-                          -1);
-      }
-
-  os->indent ();
-
-  if (!this->void_return_type (bt))
-    {
-      *os << "return ";
-    }
-
-  *os << "ACE_reinterpret_cast (" << be_idt << be_idt_nl
-      << intf->full_skel_name () << "_ptr," << be_nl
-      << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl
-      << "\"" << intf->repoID ()  << "\"" << be_uidt_nl
-      << ")" << be_uidt << be_uidt_nl
-      << ")" << be_uidt;
-
-  if (this->gen_invoke (ctx, node) == -1)
-    return -1;
-
-  if (this->void_return_type (bt))
-    {
-      os->indent ();
-      *os << "return;";
-    }
-
-  *os << be_uidt_nl
-      << "}" << be_uidt_nl;
-
-  if (!this->void_return_type (bt))
+  if (bt->node_type () != AST_Decl::NT_pre_defined
+      || be_predefined_type::narrow_from_decl (bt)->pt () != AST_PredefinedType::PT_void)
     {
       *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_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";
+  *os << "this->servant_->" << node->local_name () << " (" << be_idt << "\n";
 
   ctx = *this->ctx_;
   ctx.state (TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  visitor = tao_cg->make_visitor (&ctx);
   if (!visitor || (node->accept (visitor) == -1))
     {
       delete visitor;
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_collocated_ss::"
-                         "gen_invoke - "
+                         "(%N:%l) be_visitor_operation_ss::"
+                         "visit_operation - "
                          "codegen for making upcall failed\n"),
                         -1);
     }
-
-  // end the upcall
-  *os << be_uidt_nl
-      << ");\n" << be_uidt;
-  return 0;
-}
-
-int
-be_visitor_operation_collocated_ss::gen_check_exception (be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_visitor *visitor;
-  be_visitor_context ctx;
-
+  // last argument is the environment
+  if (node->argument_count () > 0)
+    *os << ",\n";
   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_collocated_cs::"
-                             "gen_check_exception - "
-                             "codegen failed\n"),
-                            -1);
-        }
-      *os << ");\n";
-    }
-  else
-    {
-      *os << "ACE_CHECK;\n";
-      //<< "_tao_environment);\n";
-    }
+  *os << "ACE_TRY_ENV";
+  // end the upcall
+  *os << be_uidt_nl;
+  *os << ");" << be_uidt_nl;
+  *os << "}\n\n";
 
   return 0;
 }
-
-int
-be_visitor_operation_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.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index b1331e90d75..fd1a8af8628 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -83,67 +83,3 @@ be_visitor_operation::has_param_type (be_operation *node,
   return 0;
 }
 
-//Method to generate the throw specs for exceptions that are thrown by the
-//operation 
-int
-be_visitor_operation::gen_throw_spec (be_operation *node)
-{
-
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  *os << be_idt_nl << "ACE_THROW_SPEC (("
-      << be_idt_nl << "CORBA::SystemException";
-   if (node->exceptions ())
-     {
-     
-      // initialize an iterator to iterate thru the exception list
-      UTL_ExceptlistActiveIterator *ei;
-      ACE_NEW_RETURN (ei,
-                      UTL_ExceptlistActiveIterator (node->exceptions ()),
-                      -1);
-      // continue until each element is visited
-      while (!ei->is_done ())
-        {
-          be_exception *excp = be_exception::narrow_from_decl (ei->item ());
-
-          if (excp == 0)
-            {
-              delete ei;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_operation"
-                                 "gen_throw_spec - "
-                                 "bad exception node\n"), -1);
-
-            }
-   
-          *os << "," << be_nl;
-          // allocator method
-          *os << excp->name ();
-          ei->next ();
-        } // end of while loop
-      delete ei;
-    } // end of if
-   *os << be_uidt_nl << "))"<< be_uidt;
-
-   return 0;
-
-}
-
-//Method that returns the appropriate CORBA::Environment variable
-const char *
-be_visitor_operation::gen_environment_var ()
-{
-  static const char *ace_try_env_decl = "ACE_DECLARE_NEW_CORBA_ENV;";
-  static const char *null_env_decl = "";
-
-  // check if we are generating stubs/skeletons for true C++ exception support
-  if (idl_global->exception_support ())
-    {
-      return ace_try_env_decl;
-    }
-  else
-    {
-      return null_env_decl;
-    }
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_ch.cpp
new file mode 100644
index 00000000000..91baf32300b
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_ch.cpp
@@ -0,0 +1,93 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ami_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating AMI stub code for Operation node in the
+//    client header.  
+//
+// = 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, operation_ami_ch, "$Id$")
+  
+
+// ******************************************************
+// Visitor for generating AMI stub for "operation" in client header.
+// ******************************************************
+  
+be_visitor_operation_ami_ch::be_visitor_operation_ami_ch (be_visitor_context *ctx)
+  : be_visitor_operation (ctx)
+{
+}
+
+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
+
+  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: Return type is void.
+  *os << "void ";
+  
+  // STEP 2: generate the operation name.
+  
+  // First the sendc prefix.
+  *os << "sendc_";
+  *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_OPERATION_ARGLIST_AMI);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+  if (!visitor)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_operation_ami_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_ch::"
+                         "visit_operation - "
+                         "codegen for argument list failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  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
new file mode 100644
index 00000000000..ef518c16f67
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ami_cs.cpp
@@ -0,0 +1,900 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ami_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_operation.h"
+
+ACE_RCSID(be_visitor_operation, operation_ami_cs, "$Id$")
+
+
+// ************************************************************
+// Operation visitor for client stubs
+// ************************************************************
+
+be_visitor_operation_ami_cs::be_visitor_operation_ami_cs (be_visitor_context *ctx)
+  : be_visitor_operation (ctx)
+{
+}
+
+be_visitor_operation_ami_cs::~be_visitor_operation_ami_cs (void)
+{
+}
+
+// Processing to be done after every element in the scope is
+// processed.  
+int
+be_visitor_operation_ami_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_cs::visit_operation (be_operation *node)
+{
+  TAO_OutStream *os; // output stream
+  be_visitor_context ctx;  // visitor context
+  be_visitor *visitor; // visitor
+
+  os = this->ctx_->stream ();
+  this->ctx_->node (node); // save the node for future use
+
+  os->indent (); // start with the current indentation level
+
+  // 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_scope::narrow_from_scope (node->defined_in ())->decl ();
+  if (parent == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "(%N:%l) be_visitor_operation_ami_cs::"
+                       "visit_operation - "
+                       "scope name is nil\n"),
+                      -1);
+  
+  // Generate the scope::operation name.
+  *os << parent->fullname ()
+      << "::"
+      << "sendc_"
+      << node->local_name ()->get_string ();
+
+  // Generate the argument list with the appropriate mapping (same as
+  // in the header file)
+  ctx = *this->ctx_;
+  ctx.state (TAO_CodeGen::TAO_OPERATION_ARGLIST_AMI);
+  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_cs::"
+                         "visit_operation - "
+                         "codegen for argument list failed\n"),
+                        -1);
+    }
+  delete visitor;
+
+  // 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;
+
+  // 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,
+                                      new UTL_ScopedName
+                                      (new Identifier
+                                       ("void", 1, 0, I_FALSE), 0),
+                                      0),
+                  -1);
+
+  // 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_ami_cs::"
+                             "visit_operation - "
+                             "gen_pre_stub_info failed\n"),
+                            -1);
+        }
+    }
+
+  if (node->has_native ()) // native exists => no stub
+    {
+      if (this->gen_raise_exception (bt,
+                                     "CORBA::MARSHAL",
+                                     "") == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_ami_cs::"
+                             "visit_operation - "
+                             "codegen for return var failed\n"),
+                            -1);
+        }
+    }
+  else
+    {
+      // 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
+      if (this->gen_raise_exception (bt, "CORBA::INV_OBJREF",
+                                     "") == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_ami_cs::"
+                             "visit_operation - "
+                             "codegen for checking exception failed\n"),
+                            -1);
+
+        }
+      *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
+      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_ami_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_ami_cs::"
+                             "visit_operation - "
+                             "codegen for marshal and invoke failed\n"),
+                            -1);
+
+        }
+
+      // No return values.
+      *os << "return;";
+    } // end of if (!native)
+
+  *os << be_uidt_nl << "}\n\n";
+
+  return 0;
+}
+
+int
+be_visitor_operation_ami_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_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_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_cs::"
+                             "gen_raise_exception - "
+                             "codegen for return var failed\n"),
+                            -1);
+        }
+      *os << ");\n";
+    }
+  return 0;
+}
+
+int
+be_visitor_operation_ami_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_cs::"
+                             "gen_check_exception - "
+                             "codegen failed\n"),
+                            -1);
+        }
+      *os << ");\n";
+    }
+
+  return 0;
+}
+
+// ************************************************************
+// Operation visitor for interpretive client stubs
+// ************************************************************
+
+be_interpretive_visitor_operation_ami_cs::
+be_interpretive_visitor_operation_ami_cs (be_visitor_context *ctx)
+  : be_visitor_operation_ami_cs (ctx)
+{
+}
+
+be_interpretive_visitor_operation_ami_cs::~be_interpretive_visitor_operation_ami_cs (void)
+{
+}
+
+// concrete implementation of the template methods
+
+int
+be_interpretive_visitor_operation_ami_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_cs::"
+                         "gen_pre_stub_info - "
+                         "visit scope failed\n"),
+                        -1);
+    }
+  *os << "\n";
+  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_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_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_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_cs::"
+                         "gen_marshal_and_invoke - "
+                         "codegen for return var in do_static_call failed\n"),
+                        -1);
+    }
+
+  // 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_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_cs::"
+                         "visit_operation - "
+                         "codegen for args post do_static_call failed\n"),
+                        -1);
+    }
+
+  // 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_cs::"
+                         "visit_operation - "
+                         "codegen for return type post do_static_call failed\n"),
+                        -1);
+    }
+
+  return 0;
+}
+
+// ************************************************************
+// Operation visitor for compiled client stubs
+// ************************************************************
+
+be_compiled_visitor_operation_ami_cs::
+be_compiled_visitor_operation_ami_cs (be_visitor_context *ctx)
+  : be_visitor_operation_ami_cs (ctx)
+{
+}
+
+be_compiled_visitor_operation_ami_cs::~be_compiled_visitor_operation_ami_cs (void)
+{
+}
+
+// concrete implementation of the template methods
+
+int
+be_compiled_visitor_operation_ami_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))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) "
+                             "be_compiled_visitor_operation_ami_cs::"
+                             "gen_pre_stub_info - "
+                             "Exceptionlist generation error\n"),
+                            -1);
+        }
+    }
+
+  return 0;
+}
+
+int
+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;
+  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->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
+      << "_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
+  if (this->has_param_type (node, AST_Argument::dir_IN) ||
+      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;
+
+      // marshal each in and inout argument
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_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_cs::"
+                             "gen_marshal_and_invoke - "
+                             "codegen for return var in do_static_call failed\n"),
+                            -1);
+        }
+      *os << be_uidt << be_uidt_nl
+          << "))" << be_nl;
+
+      // if marshaling fails, raise exception
+      if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
+                                     "") == -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;
+    }
+
+  *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
+  if (this->gen_check_exception (bt) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_compiled_visitor_operation_ami_cs::"
+                         "gen_marshal_and_invoke - "
+                         "codegen for checking exception failed\n"),
+                        -1);
+    }
+
+  *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;
+
+  if (this->gen_raise_exception (bt,
+                                 "CORBA::UNKNOWN",
+                                 "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_nl
+      << "}" << be_nl
+      << "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 0;
+}
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 71548c382dd..a2eed0f22a0 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -115,12 +115,6 @@ 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
-  // 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
   if (!node->has_native ())
@@ -175,7 +169,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
           << "if (istub == 0)" << be_idt_nl;
 
       // if the stub object was bad, then we raise a system exception
-      if (this->gen_raise_exception (bt, "CORBA::INTERNAL",
+      if (this->gen_raise_exception (bt, "CORBA::INV_OBJREF",
                                      "") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -702,8 +696,8 @@ 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 << "_tao_call.start (ACE_TRY_ENV);\n";
+  *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_ih.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
index 872dbd8a9f6..ed375de2dfe 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
@@ -116,7 +116,7 @@ be_visitor_operation_ih::visit_operation (be_operation *node)
   delete visitor;
 
   //generate the exceptions that are thrown by the operation
-  this->gen_throw_spec (node);
+  gen_raise_exception (node);
 
   *os << ";\n\n";
 
@@ -124,3 +124,54 @@ be_visitor_operation_ih::visit_operation (be_operation *node)
 }
 
 
+//Method to generate the exceptions that are thrown by the operation
+int
+be_visitor_operation_ih::gen_raise_exception (be_operation *node)
+{
+
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+   if (node->exceptions ())
+    {
+      os->indent ();
+     
+      // initialize an iterator to iterate thru the exception list
+      UTL_ExceptlistActiveIterator *ei;
+      ACE_NEW_RETURN (ei,
+                      UTL_ExceptlistActiveIterator (node->exceptions ()),
+                      -1);
+      *os << be_idt_nl << "TAO_THROW_SPEC ((";
+      // continue until each element is visited
+      while (!ei->is_done ())
+        {
+          be_exception *excp = be_exception::narrow_from_decl (ei->item ());
+
+          if (excp == 0)
+            {
+              delete ei;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_operation_exceptlist_cs"
+                                 "visit_operation - "
+                                 "codegen for scope failed\n"), -1);
+
+            }
+   
+
+          // allocator method
+          *os << excp->name ();
+          ei->next ();
+          if (!ei->is_done ())
+            {
+              *os << "," <<be_nl<<"\t\t";
+              //os->indent ();
+            }
+          // except the last one is processed?
+
+        } // end of while loop
+      delete ei;
+      *os << "))"<<be_uidt;
+    } // end of if
+
+   return 0;
+
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
index 65b13c9c93b..2bb11720418 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
@@ -132,7 +132,7 @@ be_visitor_operation_is::visit_operation (be_operation *node)
   delete visitor;
 
   //generate the excetions thrown by the operation
-  this->gen_throw_spec (node);
+  this->gen_raise_exception (node);
 
   *os <<be_idt_nl << "{"<<be_idt_nl;
   *os << "//Add your implementation here"<<be_uidt_nl;
@@ -173,3 +173,55 @@ be_visitor_operation_is::visit_operation (be_operation *node)
   return 0;
 }
 
+
+//method to generate the exceptions throw by the operation
+int
+be_visitor_operation_is::gen_raise_exception (be_operation *node)
+{
+
+  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+
+   if (node->exceptions ())
+    {
+      os->indent ();
+     
+      // initialize an iterator to iterate thru the exception list
+      UTL_ExceptlistActiveIterator *ei;
+      ACE_NEW_RETURN (ei,
+                      UTL_ExceptlistActiveIterator (node->exceptions ()),
+                      -1);
+      *os << be_idt_nl << "TAO_THROW_SPEC ((";
+      // continue until each element is visited
+      while (!ei->is_done ())
+        {
+          be_exception *excp = be_exception::narrow_from_decl (ei->item ());
+
+          if (excp == 0)
+            {
+              delete ei;
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_operation_exceptlist_cs"
+                                 "visit_operation - "
+                                 "codegen for scope failed\n"), -1);
+
+            }
+   
+
+          // allocator method
+          *os << excp->name ();
+          ei->next ();
+          if (!ei->is_done ())
+            {
+              *os << "," <<be_nl<<"\t\t";
+              //os->indent ();
+            }
+          // except the last one is processed?
+
+        } // end of while loop
+      delete ei;
+      *os << "))"<<be_uidt;
+    } // end of if
+
+   return 0;
+
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index 05bca9d22d2..406daad2b87 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -138,7 +138,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
           << "CORBA::ServerRequest &_tao_req, " << be_nl
           << "void *_tao_obj, " << be_nl
           << "void *_tao_context, " << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+          << "CORBA::Environment &_tao_env = " << be_idt_nl
 	  << "TAO_default_environment ()"
 	  << be_uidt << be_uidt_nl
 	  << ");" << be_uidt << "\n\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index 6393df9bed9..433346ef360 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -131,6 +131,8 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
     }
 
   os->indent ();
+  // declare an environment variable for user raised exceptions
+  //  *os << "CORBA::Environment _tao_skel_environment;" << be_nl;
   // get the right object implementation.
   *os << intf->full_skel_name () << " *_tao_impl = ("
       << intf->full_skel_name () << " *)_tao_object_reference;\n\n";
@@ -183,7 +185,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_operation_ss::"
                          "visit_operation - "
-                         "codegen for pre upcall failed\n"),
+                         "codegen for making upcall failed\n"),
                         -1);
     }
   // make the upcall and assign to the return val
@@ -214,9 +216,15 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
                          "codegen for making upcall failed\n"),
                         -1);
     }
-
+  // last argument is the environment
+  if (node->argument_count () > 0)
+    *os << ",\n";
+  os->indent ();
+  //  *os << "_tao_skel_environment";
+  *os << "ACE_TRY_ENV";
   // end the upcall
-  *os << be_uidt_nl << ");\n";
+  *os << be_uidt_nl;
+  *os << ");\n";
 
   if (node->flags () != AST_Operation::OP_oneway)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
index 760209f4738..49e1870f8d3 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
@@ -46,10 +46,12 @@ be_visitor_operation_rettype_return_cs::~be_visitor_operation_rettype_return_cs
 int
 be_visitor_operation_rettype_return_cs::visit_array (be_array *)
 {
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
+   // Grab the out stream
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // os->indent ();
+  // *os << "return _tao_retval;\n";
 
-  //os->indent ();
-  //*os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
@@ -60,7 +62,7 @@ be_visitor_operation_rettype_return_cs::visit_enum (be_enum *)
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
   //os->indent ();
-  //*os << "return _tao_retval;\n";
+  // *os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
@@ -70,8 +72,8 @@ be_visitor_operation_rettype_return_cs::visit_interface (be_interface *)
 {
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
-  //os->indent ();
-  //*os << "return _tao_retval;\n";
+  // os->indent ();
+  // *os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
@@ -82,7 +84,7 @@ be_visitor_operation_rettype_return_cs::visit_interface_fwd (be_interface_fwd *)
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
   //os->indent ();
-  //*os << "return _tao_retval;\n";
+  // *os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
@@ -95,7 +97,7 @@ be_visitor_operation_rettype_return_cs::visit_valuetype (be_valuetype *)
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
   //os->indent ();
-  //*os << "return _tao_retval;\n";
+  // *os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
@@ -106,7 +108,7 @@ be_visitor_operation_rettype_return_cs::visit_valuetype_fwd (be_valuetype_fwd *)
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
   //os->indent ();
-  //*os << "return _tao_retval;\n";
+  // *os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
@@ -122,10 +124,10 @@ be_visitor_operation_rettype_return_cs::visit_predefined_type (be_predefined_typ
   switch (node->pt ())
     {
     case AST_PredefinedType::PT_void:
-      //*os << "return;\n";
+      // *os << "return;\n";
       break;
     default:
-      //*os << "return _tao_retval;\n";
+      // *os << "return _tao_retval;\n";
       *os << "_tao_retval";
       break;
     }
@@ -138,7 +140,7 @@ be_visitor_operation_rettype_return_cs::visit_sequence (be_sequence *)
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
   //os->indent ();
-  //*os << "return _tao_retval;\n";
+  // *os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
@@ -149,7 +151,7 @@ be_visitor_operation_rettype_return_cs::visit_string (be_string *)
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
   //os->indent ();
-  //*os << "return _tao_retval;\n";
+  // *os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
@@ -160,7 +162,7 @@ be_visitor_operation_rettype_return_cs::visit_structure (be_structure *)
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
   //os->indent ();
-  //*os << "return _tao_retval;\n";
+  // *os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
@@ -187,7 +189,7 @@ be_visitor_operation_rettype_return_cs::visit_union (be_union *)
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
 
   //os->indent ();
-  //*os << "return _tao_retval;\n";
+  // *os << "return _tao_retval;\n";
   *os << "_tao_retval";
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
index 098429b1537..03340daede0 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
@@ -146,10 +146,13 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node)
                          "codegen for making upcall failed\n"),
                         -1);
     }
-  // end the upcall
-  *os << be_uidt_nl;
-  *os << ");" << be_uidt_nl;
-  *os << "}\n\n";
+  // last argument is the environment
+  if (node->argument_count () > 0)
+    *os << ",\n";
+  os->indent ();
+  *os << "ACE_TRY_ENV" << be_uidt_nl
+      << ");" << be_uidt_nl
+      << "}\n\n";
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index ecd3cc52ddd..5847b489aa0 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -276,7 +276,6 @@ be_visitor_root::visit_constant (be_constant *node)
     case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
     case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
     case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CI:
     case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
     case TAO_CodeGen::TAO_ROOT_CI:
     case TAO_CodeGen::TAO_ROOT_SH:
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp
index 1a50a9cf145..d81d919d9d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/elemtype.cpp
@@ -95,10 +95,10 @@ be_visitor_sequence_elemtype::visit_predefined_type (be_predefined_type *node)
       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> ";
+              << bt->nested_type_name (this->ctx_->scope ()) << "> ";
         }
       else
-        *os << "TAO_Object_Manager<" << bt->name () << ","<<bt->name ()<<"_var> ";    
+        *os << "TAO_Object_Manager<" << bt->name () << "> ";        
 
       os->gen_endif_AHETI();
       break;
@@ -148,10 +148,10 @@ be_visitor_sequence_elemtype::visit_interface (be_interface *node)
   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> ";
+          << bt->nested_type_name (this->ctx_->scope ()) << "> ";
     }
   else
-    *os << "TAO_Object_Manager<" << bt->name () <<","<<bt->name ()<<"_var> ";        
+    *os << "TAO_Object_Manager<" << bt->name () << "> ";        
 
   os->gen_endif_AHETI();
 
@@ -187,10 +187,10 @@ be_visitor_sequence_elemtype::visit_interface_fwd (be_interface_fwd *node)
   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> ";
+          << bt->nested_type_name (this->ctx_->scope ()) << "> ";
     }
   else
-    *os << "TAO_Object_Manager<" << bt->name () <<","<<bt->name ()<<"_var>";        
+    *os << "TAO_Object_Manager<" << bt->name () << "> ";        
 
   os->gen_endif_AHETI();
 
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
index 03466b9d012..6a48566cb59 100644
--- 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
@@ -111,11 +111,6 @@ be_visitor_sequence_ch::gen_object_manager (be_sequence *node)
   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;
@@ -130,7 +125,7 @@ be_visitor_sequence_ch::gen_object_manager (be_sequence *node)
   pt->accept (visitor); 
   *os << " *&(); // Cast." << be_nl;
   
-  // 
+  // @@Bala
   // in method
   //*os << "const "; 
   pt->accept (visitor); 
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
index 97167aae41c..872ade7ab2b 100644
--- 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
@@ -170,33 +170,8 @@ be_visitor_sequence_ci::gen_object_manager (be_sequence *node)
       << "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 -> 
+  // operator -> @@Bala
   *os << "ACE_INLINE " << be_nl;
     pt->accept (visitor);
   *os << "*"<< be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
index 0b3bb8a627e..78aaef41f62 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
@@ -42,7 +42,6 @@ be_visitor_sequence_base::~be_visitor_sequence_base (void)
 {
 }
 
-
 int
 be_visitor_sequence_base::visit_predefined_type (be_predefined_type *node)
 {
@@ -79,9 +78,7 @@ be_visitor_sequence_base::visit_sequence (be_sequence *node)
 int
 be_visitor_sequence_base::visit_interface (be_interface *node)
 {
-  
   return this->visit_node (node);
-
 }
 
 int
@@ -142,53 +139,3 @@ be_visitor_sequence_base::visit_typedef (be_typedef *node)
   this->ctx_->alias (0);
   return 0;
 }
-
-
-be_visitor_sequence_base_template_args::be_visitor_sequence_base_template_args (be_visitor_context *ctx,
-                                                                                be_sequence *seq)
-  :be_visitor_sequence_base (ctx),
-   beseq_ (seq)
-{
-  // no-op
-}
-
-
-be_visitor_sequence_base_template_args::~be_visitor_sequence_base_template_args (void)
-{
-  //no-op
-}
-
-int
-be_visitor_sequence_base_template_args::visit_interface (be_interface *node)
-{
-TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt = node;
-
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_SEQUENCE_BASE_CH)
-    {
-      *os << bt->nested_type_name (this->ctx_->scope ())
-        << ",";
-      *os << bt->nested_type_name (this->ctx_->scope (), "_var");
-    }
-  else
-    *os << bt->name ()
-        << "," << bt->name () << "_var";
-
-  return 0;  
-    
-}
-
-int
-be_visitor_sequence_base_template_args::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  *os << node->name ();
-  if (beseq_->managed_type () == be_sequence::MNG_PSEUDO ||
-      beseq_->managed_type () == be_sequence::MNG_OBJREF)
-    *os << "," << node->name () << "_var";
-      
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index 26a8f5c15ba..d618daf3c56 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -93,15 +93,11 @@ be_visitor_sequence_ch::gen_base_sequence_class (be_sequence *node)
       break;
     }
 
-  be_visitor_context *ctx;
-  ACE_NEW_RETURN (ctx,
-                  be_visitor_context (*this->ctx_),
-                  0);
-  be_visitor_sequence_base_template_args visitor (ctx, node);
-  ctx->state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
-  //be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (bt->accept (&visitor) == -1)
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+
+  if (bt->accept (visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_ch::"
@@ -109,7 +105,7 @@ be_visitor_sequence_ch::gen_base_sequence_class (be_sequence *node)
                          "base type visit failed\n"),
                         -1);
     }
-  //delete visitor;
+  delete visitor;
 
   // find out if the sequence is of a managed type and if it is bounded or not
   if (node->managed_type () == be_sequence::MNG_STRING)
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index d74ffea45d1..0a0ca1f7832 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -97,15 +97,11 @@ be_visitor_sequence_cs::gen_base_sequence_class (be_sequence *node)
       break;
     }
 
-  be_visitor_context *ctx;
-  ACE_NEW_RETURN (ctx,
-                  be_visitor_context (*this->ctx_),
-                  0);
-  be_visitor_sequence_base_template_args visitor (ctx,node);
-  ctx->state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS);
-  //be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (bt->accept (&visitor) == -1)
+  be_visitor_context ctx (*this->ctx_);
+  ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS);
+  be_visitor *visitor = tao_cg->make_visitor (&ctx);
+
+  if (bt->accept (visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_cs::"
@@ -113,7 +109,7 @@ be_visitor_sequence_cs::gen_base_sequence_class (be_sequence *node)
                          "base type visit failed\n"),
                         -1);
     }
-  //delete visitor;
+  delete visitor;
 
   // find out if the sequence is of a managed type and if it is bounded or not
   if (node->managed_type () == be_sequence::MNG_STRING)
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
index cf754a4db2c..073ad7649aa 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
@@ -196,27 +196,17 @@ be_visitor_typedef_ch::visit_array (be_array *node)
           << " " << tdef->nested_type_name (scope, "_out") << ";" << be_nl;
       *os << "typedef " << bt->nested_type_name (scope, "_forany")
           << " " << tdef->nested_type_name (scope, "_forany") << ";" << be_nl;
-
       // the _alloc, _dup, copy, and free methods
-
-      // Since the function nested_type_name() contains a static buffer,
-      // we can have only one call to it from any instantiation per stream
-      // output statement.
-
-      // _alloc
-      *os << "ACE_INLINE " << tdef->nested_type_name (scope, "_slice") << " *";
-      *os << tdef->nested_type_name (scope, "_alloc") << " (void);" << be_nl;
-      // _dup
-      *os << "ACE_INLINE " << tdef->nested_type_name (scope, "_slice") << " *";
-      *os << tdef->nested_type_name (scope, "_dup") << " (const ";
-      *os << tdef->nested_type_name (scope, "_slice") << " *_tao_slice);" << be_nl;
-      // _copy
-      *os << "ACE_INLINE void " << tdef->nested_type_name (scope, "_copy") << " (";
-      *os << tdef->nested_type_name (scope, "_slice") << " *_tao_to, const ";
-      *os << tdef->nested_type_name (scope, "_slice") << " *_tao_from);" << be_nl;
-      // _free
-      *os << "ACE_INLINE void " << tdef->nested_type_name (scope, "_free") << " (";
-      *os << tdef->nested_type_name (scope, "_slice") << " *_tao_slice);" << be_nl;
+      *os << "static " << tdef->nested_type_name (scope, "_slice") << " *"
+          << tdef->nested_type_name (scope, "_alloc") << " (void);" << be_nl;
+      *os << "static " << tdef->nested_type_name (scope, "_slice") << " *"
+          << tdef->nested_type_name (scope, "_dup") << " (const "
+          << tdef->nested_type_name (scope, "_slice") << " *_tao_slice);" << be_nl;
+      *os << "static void " << tdef->nested_type_name (scope, "_copy") << " ("
+          << tdef->nested_type_name (scope, "_slice") << " *_tao_to, const "
+          << tdef->nested_type_name (scope, "_slice") << " *_tao_from);" << be_nl;
+      *os << "static void " << tdef->nested_type_name (scope, "_free") << " ("
+          << tdef->nested_type_name (scope, "_slice") << " *_tao_slice);" << be_nl;
     }
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
index f8cc5a64aa0..cfee3582b2f 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
@@ -57,88 +57,6 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
 
   os = this->ctx_->stream ();
 
-  // now check if we need to generate the _default () method
-  be_union::DefaultValue dv;
-  if (bu->default_value (dv) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_discriminant_ci::"
-                         "visit_enum - "
-                         "computing default value failed\n"),
-                        -1);
-    }
-  if ((dv.computed_ != 0) && (bu->default_index () == -1))
-    {
-      // only if all cases are not covered AND there is no explicit
-      // default, we get the _default () method
-      os->indent ();
-      *os << "// the implicit _default () method" << be_nl;
-      *os << "ACE_INLINE void " << be_nl
-          << bu->name () << "::_default ()" << be_nl
-          << "{" << be_idt_nl
-          << "this->disc_ = ";
-      switch (bu->udisc_type ())
-        {
-        case AST_Expression::EV_short:
-          *os << dv.u.short_val;
-          break;
-        case AST_Expression::EV_ushort:
-          *os << dv.u.ushort_val;
-          break;
-        case AST_Expression::EV_long:
-          *os << dv.u.long_val;
-          break;
-        case AST_Expression::EV_ulong:
-          *os << dv.u.ulong_val;
-          break;
-        case AST_Expression::EV_char:
-          os->print ("%d", dv.u.char_val);
-          break;
-        case AST_Expression::EV_bool:
-          *os << dv.u.bool_val;
-          break;
-        case AST_Expression::EV_any:
-        // The discriminant is an enum. Some compilers will
-        // not accept a numeric value assigned to this
-        // discriminant, so we must generate the string name.
-          {
-            be_type* dt =
-              be_type::narrow_from_decl (bu->disc_type ());
-            if (dt == 0)
-              return -1;
-
-            // Find where was the enum defined, if it was defined in the globa
-            // scope, then it is easy to generate the enum values....
-            be_scope* scope =
-              be_scope::narrow_from_scope (dt->defined_in ());
-            if (scope == 0)
-              {
-                *os << node->value_to_name (dv.u.enum_val);
-                return 0;
-              }
-
-            // But if it was generated inside a module or something similar then
-            // we must prefix the enum value with something...
-            be_decl* decl =
-              scope->decl ();
-            *os << decl->fullname () << "::" 
-                << node->value_to_name (dv.u.enum_val);
-            break;
-          }
-        case AST_Expression::EV_longlong:
-        case AST_Expression::EV_ulonglong:
-          // unimplemented
-        default:
-          // error caught earlier.
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_union_discriminant_ci::"
-                             "visit_enum - "
-                             "bad or unimplemented discriminant type\n"),
-                        -1);
-        }
-      *os << ";" << be_uidt_nl << "}\n\n";
-    }
-
   os->indent ();
   // the set method
   *os << "// accessor to set the discriminant" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
index 8790e6a339b..b170b425627 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
@@ -88,6 +88,63 @@ int be_visitor_union_ci::visit_union (be_union *node)
           << "return &this->disc_;" << be_uidt_nl
           << "}\n\n";
 
+      // now check if we need to generate the _default () method
+      be_union::DefaultValue dv;
+      if (node->default_value (dv) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_union_ci::"
+                             "visit_union - "
+                             "computing default value failed\n"),
+                            -1);
+        }
+      if ((dv.computed_ != 0) && (node->default_index () == -1))
+        {
+          // only if all cases are not covered AND there is no explicit
+          // default, we get the _default () method
+          os->indent ();
+          *os << "// the implicit _default () method" << be_nl;
+          *os << "ACE_INLINE void " << be_nl
+              << node->name () << "::_default ()" << be_nl
+              << "{" << be_idt_nl
+              << "this->disc_ = ";
+          switch (node->udisc_type ())
+            {
+            case AST_Expression::EV_short:
+              *os << dv.u.short_val;
+              break;
+            case AST_Expression::EV_ushort:
+              *os << dv.u.ushort_val;
+              break;
+            case AST_Expression::EV_long:
+              *os << dv.u.long_val;
+              break;
+            case AST_Expression::EV_ulong:
+              *os << dv.u.ulong_val;
+              break;
+            case AST_Expression::EV_char:
+              os->print ("%d", dv.u.char_val);
+              break;
+            case AST_Expression::EV_bool:
+              *os << dv.u.bool_val;
+              break;
+            case AST_Expression::EV_any:
+              *os << dv.u.enum_val;
+              break;
+            case AST_Expression::EV_longlong:
+            case AST_Expression::EV_ulonglong:
+              // unimplemented
+            default:
+              // error caught earlier.
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_union_ci::"
+                                 "visit_union - "
+                                 "bad or unimplemented discriminant type\n"),
+                            -1);
+            }
+          *os << ";" << be_uidt_nl << "}\n\n";
+        }
+
       // the discriminant type may have to be defined here if it was an enum
       // declaration inside of the union statement.
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
index f2be1ad27d7..7ef8ae84983 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
@@ -671,8 +671,8 @@ be_visitor_union_branch_public_ch::visit_union (be_union *node)
       ctx.node (node); // set the node to be the node being visited. The scope
                        // is still the same
 
-      // first generate the union declaration
-      ctx.state (TAO_CodeGen::TAO_UNION_CH);
+      // first generate the sequence declaration
+      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
       be_visitor *visitor = tao_cg->make_visitor (&ctx);
       if (!visitor)
         {
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 1c26fd0b14a..c34bbfde38b 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -263,7 +263,7 @@ public:
     TAO_OPERATION_TIE_SH,
     TAO_OPERATION_TIE_SI,
 
-    TAO_OBV_OPERATION_ARGLIST_CH,      // parameter list in obv op signature
+    TAO_OBV_OPERATION_ARGLIST_CH,            // parameter list in obv op signature
                                              // ... for client header
     TAO_OBV_OPERATION_ARGLIST_OBV_CH,        // ... for OBV_ class
     TAO_OBV_OPERATION_ARGLIST_SH,            // ... for server header
@@ -272,7 +272,19 @@ public:
     TAO_OBV_OPERATION_ARGLIST_COLLOCATED_SH,   // ... for collocated server
     TAO_OBV_OPERATION_ARGLIST_OTHERS,          // ... for all other cases
 
-    // emitting code for root
+    // Emitting code for AMI.
+    TAO_OPERATION_AMI_CH,                  // AMI stub generation.  
+    TAO_OPERATION_AMI_CS,                  // AMI stub generation.  
+    TAO_OPERATION_ARGLIST_AMI,             // AMI stubs in client header
+    TAO_OPERATION_ARG_AMI,                 // AMI stub.
+    TAO_ARGUMENT_AMI,                      // Argument in AMI stub.
+    TAO_ARGUMENT_ARGLIST_AMI,              // 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.
+
+    // Emitting code for root.
     TAO_ROOT_CH,
     TAO_ROOT_CI,
     TAO_ROOT_CS,
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
index 38073ed6915..c87f73cdb60 100644
--- a/TAO/TAO_IDL/be_include/be_enum.h
+++ b/TAO/TAO_IDL/be_include/be_enum.h
@@ -42,9 +42,6 @@ public:
   virtual int member_count (void);
   // return the count of members
 
-  // Convert a numeric value to the enum's string name for it.
-  virtual UTL_ScopedName        *value_to_name (const unsigned long v);
-
   // Visiting
   virtual int accept (be_visitor *visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 3a1cccd7baa..c9c5faaa546 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -54,28 +54,36 @@ public:
   ~be_interface (void);
   // dtor
 
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
+  virtual int gen_var_defn (char *interface_name = 0);
+  // generate the var definition. If <interface_name> is not 0, generate
+  // the var defn for that name. Otherwise, do it for the interface you
+  // are visiting (this).
+  
   virtual void gen_def_ctors (TAO_OutStream* os);
   //call the default constructors of all the base classes
 
-
-
   virtual void gen_copy_ctors (TAO_OutStream* os);
   //call the copy constructors of all the base classes
 
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
+  virtual int gen_var_impl (char *interface_local_name = 0,
+                            char *interface_full_name  = 0);
+  // Generate the implementation for the _var class.
+  // If any one of the argument is 0, then use the name in <this>,
+  // otherwise use the name given. Just making the class more useful. 
 
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
+  virtual int gen_out_defn (char *interface_name = 0);
+  // Generate the out class definition. If <interface_name> is not 0,
+  // generate the out defn for that name. Otherwise, do it for the
+  // interface you are visiting (this).
 
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
+  virtual int gen_out_impl (char *interface_local_name = 0,
+                            char *interface_full_name = 0);
+  // Generate the out class implementation. 
+  // If any one of the argument is 0, then use the name giin this
+  // node, else use the arguments. 
 
   const char *full_skel_name (void);
-  // retrieve the fully scoped skel class name
+  // Retrieve the fully scoped skel class name. 
 
   //
   // Each interface (to fix names "T") also defines two help classes,
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
index b4333cebb65..6e3fb336232 100644
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ b/TAO/TAO_IDL/be_include/be_union.h
@@ -72,7 +72,7 @@ public:
     union PermittedTypes
     {
       char char_val;
-      unsigned long bool_val;
+      idl_bool bool_val;
       ACE_INT16 short_val;
       ACE_UINT16 ushort_val;
       ACE_INT32 long_val;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument.h
index 560d37f2859..194cb2f387b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument.h
@@ -39,5 +39,6 @@
 #include "be_visitor_argument/compiled_marshal_cs.h"
 #include "be_visitor_argument/compiled_marshal_ss.h"
 #include "be_visitor_argument/pre_invoke_cs.h"
+#include "be_visitor_argument/arglist_ami.h"
 
 #endif /* _BE_VISITOR_ARGUMENT_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist_ami.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist_ami.h
new file mode 100644
index 00000000000..85df0e4cc67
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist_ami.h
@@ -0,0 +1,96 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist_ami.h
+//
+// = DESCRIPTION
+//    Visitor for generation of code for Arguments as parameter lists
+//    in the operation signature of an AMI stub.
+//
+// = AUTHOR
+//    Aniruddha Gokhale & Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_ARGUMENT_ARGLIST_AMI_H_
+#define _BE_VISITOR_ARGUMENT_ARGLIST_AMI_H_
+
+class be_visitor_args_arglist_ami : public be_visitor_args
+{
+  //
+  // = TITLE
+  //   Generates the code for arguments output.
+  //
+  // = DESCRIPTION
+  //   At several stages in the code generation a node of type
+  //   "be_operation" is visited, and the code for its arguments must
+  //   be generated.
+  //   Sometimes the argument declarations must be generated (such as
+  //   in the class declaration), other the arguments names (such as
+  //   in method invocations).
+  //   This class implements the declaration output, in other words,
+  //   it outputs both the arguments and their types.
+  //
+public:
+  be_visitor_args_arglist_ami (be_visitor_context *ctx);
+  // Constructor.
+
+  virtual ~be_visitor_args_arglist_ami (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
+  
+
+  virtual int visit_native (be_native *node);
+  // visit native node
+
+  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   
+                              
+#ifdef IDL_HAS_VALUETYPE      
+  virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype          
+  
+  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype_fwd      
+#endif /* IDL_HAS_VALUETYPE */
+};
+
+#endif /* _BE_VISITOR_ARGUMENT_ARGLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index e67eeba6b12..1fd6fad3cf9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -41,5 +41,6 @@
 #include "be_visitor_interface/cdr_op_cs.h"
 #include "be_visitor_interface/tie_sh.h"
 #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"
 #endif /* _BE_VISITOR_INTERFACE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h
new file mode 100644
index 00000000000..b495ed84e2f
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ch.h
@@ -0,0 +1,48 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_fwd_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface Forward node.
+//    This one provides code generation for interface forward node.
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu> 
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_AMI_HANDLER_FWD_CH_H_
+#define _BE_INTERFACE_AMI_HANDLER_FWD_CH_H_
+
+class be_visitor_ami_handler_fwd_ch : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //   be_visitor_ami_handler_fwd_ch
+  //
+  // = DESCRIPTION
+  //   This visitor visits the an interface and generates fwd
+  //   declaration code for the AMI Handler interface.
+  //
+  //
+public:
+  be_visitor_ami_handler_fwd_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_ami_handler_fwd_ch (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface.
+};
+
+#endif /* _BE_INTERFACE_AMI_HANDLER_FWD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h
new file mode 100644
index 00000000000..ecd01235f01
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_handler_fwd_ci.h
@@ -0,0 +1,49 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_fwd_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface Forward node.
+//    This one provides code generation for interface forward node.
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>  
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_AMI_HANDLER_FWD_CI_H_
+#define _BE_INTERFACE_AMI_HANDLER_FWD_CI_H_
+
+class be_visitor_ami_handler_fwd_ci : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //   be_visitor_ami_handler_fwd_ci
+  //
+  // = DESCRIPTION
+  //   This visitor visits the interface to generate the forward
+  //   declration code for the AMI reply handler.
+  //
+  //
+public:
+  be_visitor_ami_handler_fwd_ci (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_ami_handler_fwd_ci (void);
+  // destructor
+
+  virtual int visit_interface (be_interface *node);
+  // visit interface.
+
+};
+
+#endif /* _BE_INTERFACE_INTERFACE_FWD_CH_I_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
index 34bea04cac1..0294553503b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
@@ -44,7 +44,6 @@ public:
 
   virtual int visit_interface (be_interface *node);
   // set the right context and make a visitor
-
 };
 
 #endif /* _BE_INTERFACE_INTERFACE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
index dafe44c68f8..a32da4c3de0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
@@ -28,5 +28,4 @@
 #include "be_visitor_interface_fwd/interface_fwd_ch.h"
 #include "be_visitor_interface_fwd/interface_fwd_ci.h"
 #include "be_visitor_interface_fwd/cdr_op_ci.h"
-
 #endif /* TAO_BE_VISITOR_INTERFACE_FWD_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
index b74e135e9e4..e9fd1f3a0e6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h
@@ -53,5 +53,8 @@
 #include "be_visitor_operation/rettype_marshal_ss.h"
 #include "be_visitor_operation/compiled_marshal.h"
 #include "be_visitor_operation/rettype_pre_invoke_cs.h"
+#include "be_visitor_operation/operation_ami_ch.h"
+#include "be_visitor_operation/operation_ami_cs.h"
+#include "be_visitor_operation/arglist_ami.h"
 
 #endif // TAO_BE_VISITOR_OPERATION_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
index a42834b2868..67de889815a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
@@ -26,7 +26,7 @@
 // Operation visitor for argument list - generates parameters in the signature
 // ******************************************************************************
 
-class be_visitor_operation_arglist : public be_visitor_operation
+class be_visitor_operation_arglist : public be_visitor_scope
 {
   //
   // = TITLE
@@ -43,15 +43,12 @@ public:
   ~be_visitor_operation_arglist (void);
   // destructor
 
-  virtual int visit_operation (be_operation *node);
+  int visit_operation (be_operation *node);
   // visit the operation
 
-  virtual int visit_argument (be_argument *node);
+  int visit_argument (be_argument *node);
   // visit each argument
 
-  virtual int post_process (be_decl *);
-  // stuff to o/p after each element of the scope is handled
-
 };
 
 #endif /* _BE_VISITOR_OPERATION_ARGLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist_ami.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist_ami.h
new file mode 100644
index 00000000000..532e6463974
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist_ami.h
@@ -0,0 +1,54 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist_ami.h
+//
+// = DESCRIPTION
+//    Visitor for generating IDL Stub code for IDL operations. This
+//    generates the operation signature for the IDL stub. 
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_ARGLIST_AMI_H_
+#define _BE_VISITOR_OPERATION_ARGLIST_AMI_H_
+
+// ******************************************************************************
+// Operation visitor for argument list - generates parameters in the signature
+// ******************************************************************************
+
+class be_visitor_operation_arglist_ami : public be_visitor_scope
+{
+  //
+  // = TITLE
+  //     be_visitor_operaion_arglist_ami
+  //
+  // = DESCRIPTION
+  //     This is a visitor to generate operation argument list for an
+  //     AMI stub.
+  //
+  //
+public:
+  be_visitor_operation_arglist_ami (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_arglist_ami (void);
+  // destructor
+
+  int visit_operation (be_operation *node);
+  // visit the operation
+
+  int visit_argument (be_argument *node);
+  // visit each argument
+};
+
+#endif /* _BE_VISITOR_OPERATION_ARGLIST_AMI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
index 320e7a9aff1..08e41106e3f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
@@ -26,7 +26,7 @@
 // generic operation visitor for docall, upcall, pre/post
 // ************************************************************
 
-class be_visitor_operation_argument : public be_visitor_operation
+class be_visitor_operation_argument : public be_visitor_scope
 {
   //
   // = TITLE
@@ -43,13 +43,13 @@ public:
   ~be_visitor_operation_argument (void);
   // destructor
 
-  virtual int post_process (be_decl *);
+  int post_process (be_decl *);
   // stuff to o/p after each element of the scope is handled
 
-  virtual int visit_operation (be_operation *node);
+  int visit_operation (be_operation *node);
   // visit the operation
 
-  virtual int visit_argument (be_argument *node);
+  int visit_argument (be_argument *node);
   // visit argument
 
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h
index c1d9720ffe1..e0aac140703 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/collocated_ss.h
@@ -47,14 +47,6 @@ public:
   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_COLLOCATED_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
index 07e9e98e68b..79e63a0ba13 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
@@ -50,11 +50,6 @@ public:
   virtual int has_param_type (be_operation *, AST_Argument::Direction);
   // does any of the argument node have the specified direction
 
-  virtual int gen_throw_spec (be_operation *node);
-  // generate the throw specification
-
-  virtual const char *gen_environment_var (void);
-  // generate the environment variable declaration
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ami.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ami.h
new file mode 100644
index 00000000000..f2003a6db22
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ami.h
@@ -0,0 +1,51 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ami.h
+//
+// = DESCRIPTION
+//    Visitor for generating AMI stub code for IDL operations in
+//    client header.  
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_OPERATION_AMI_H_
+#define _BE_VISITOR_OPERATION_OPERATION_AMI_H_
+
+// ************************************************************
+// Operation visitor to generate AMI stubs for client header
+// ************************************************************
+
+class be_visitor_operation_ami : public be_visitor_operation
+{
+  //
+  // = TITLE
+  //     be_visitor_operation_ami.
+  //
+  // = DESCRIPTION
+  //     This is a concrete visitor to generate the AMI stubs in the
+  //     client header for operation.
+  //
+  //
+public:
+  be_visitor_operation_ami (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami (void);
+  // destructor
+
+  virtual int visit_operation (be_operation *node);
+  // visit operation.
+};
+
+#endif /* _BE_VISITOR_OPERATION_OPERATION_AMI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ami_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ami_ch.h
new file mode 100644
index 00000000000..9db97cff0bb
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ami_ch.h
@@ -0,0 +1,51 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ami_ch.h
+//
+// = DESCRIPTION
+//    Visitor for generating AMI stub code for IDL operations in
+//    client header.  
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_OPERATION_AMI_CH_H_
+#define _BE_VISITOR_OPERATION_OPERATION_AMI_CH_H_
+
+// ************************************************************
+// Operation visitor to generate AMI stubs for client header
+// ************************************************************
+
+class be_visitor_operation_ami_ch : public be_visitor_operation
+{
+  //
+  // = TITLE
+  //     be_visitor_operation_ami_ch.
+  //
+  // = DESCRIPTION
+  //     This is a concrete visitor to generate the AMI stubs in the
+  //     client header for operation.
+  //
+  //
+public:
+  be_visitor_operation_ami_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami_ch (void);
+  // destructor
+
+  virtual int visit_operation (be_operation *node);
+  // visit operation.
+};
+
+#endif /* _BE_VISITOR_OPERATION_OPERATION_AMI_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ami_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ami_cs.h
new file mode 100644
index 00000000000..6c324505aa0
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ami_cs.h
@@ -0,0 +1,125 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ami_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_OPERATION_AMI_CS_H_
+#define _BE_VISITOR_OPERATION_OPERATION_AMI_CS_H_
+
+// ************************************************************
+// Operation visitor for client stubs
+// ************************************************************
+
+class be_visitor_operation_ami_cs : public be_visitor_operation
+{
+  //
+  // = TITLE
+  //   be_visitor_operation_ami_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //
+  //
+public:
+  be_visitor_operation_ami_cs (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_operation_ami_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_cs : public be_visitor_operation_ami_cs
+{
+  //
+  // = TITLE
+  //   be_interpretive_visitor_operation_ami_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //   using interpretive marshaling.
+  //
+  //
+public:
+  be_interpretive_visitor_operation_ami_cs (be_visitor_context *);
+  // ctor
+
+  ~be_interpretive_visitor_operation_ami_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_cs : public be_visitor_operation_ami_cs
+{
+  //
+  // = TITLE
+  //   be_compiled_visitor_operation_ami_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //   using compiled marshaling.
+  //
+  //
+public:
+  be_compiled_visitor_operation_ami_cs (be_visitor_context *);
+  // ctor
+
+  ~be_compiled_visitor_operation_ami_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_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h
index 01b80ead8d6..1cc42709834 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h
@@ -43,6 +43,8 @@ public:
   virtual int visit_operation (be_operation *node);
   // visit operation. We provide code for this method in the derived class
 
+  int gen_raise_exception (be_operation *node);
+
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_IH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h
index 31743cdbba4..1c1b23cdd2e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h
@@ -43,6 +43,8 @@ public:
   virtual int visit_operation (be_operation *node);
   // visit operation. We provide code for this method in the derived class
 
+  int gen_raise_exception (be_operation *node);
+
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_IS_CPP_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
index ecccc19f8a7..ef1ac6a4cd2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
@@ -66,30 +66,4 @@ protected:
 
 };
 
-class be_visitor_sequence_base_template_args: public be_visitor_sequence_base
-{
-  //
-  // =TITLE
-  // be_visitor_sequnce_base_template_args
-  // 
-  // =Description
-  // This is a derived class just used to override the method
-  // visit_interface that generates the arguments for the
-  // templates. This is necessary as the same visitor was being used
-  // by the idl compiler to generate the template arguments and the
-  // return arguments for some of the methods.
-public:
-  be_visitor_sequence_base_template_args (be_visitor_context *ctx,
-                                          be_sequence *node );
-  
-  ~be_visitor_sequence_base_template_args (void);
-  //Dtor
-
-  //= Visit methods
-  virtual int visit_interface (be_interface *node);
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-private:
-  be_sequence *beseq_;
-};
 #endif /* _BE_VISITOR_SEQUENCE_SEQUENCE_BASE_H_ */
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index a912f1cf99b..e81f5d3d615 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -129,6 +129,9 @@ DRV_usage (void)
   cerr << GTDEVEL (" -Gv\t\t\tenable OBV (Valuetype) support (disabled by default)\n");
 #endif /* IDL_HAS_VALUETYPE */
   cerr << GTDEVEL (" -GI[h|s|b|e|c]\tGenerate Implemenation Files \n");
+
+  cerr << GTDEVEL (" -GC \t\tGenerate the code for using AMI Call back model\n");
+
   cerr << GTDEVEL ("  \t\t\th - Implementation header file name ending. Default is I.h \n");
   cerr << GTDEVEL ("  \t\t\ts - Implementation skeleton file name ending. Default is I.cpp\n");
   cerr << GTDEVEL ("  \t\t\tb - Prefix to the implementation class names. Default is 'no prefix' \n");
@@ -377,6 +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.  
 
               // Directory where all the IDL-Compiler-Generated files are to
               // be kept. Default is the current directory from which the
@@ -577,12 +583,17 @@ DRV_parse_args (long ac, char **av)
                 }
               break;
             case 'G':
-              // enable generation of ...
+              // Enable generation of ...
               if (av[i][2] == 'c')
                 {
                   // compiled marshaling support
                   idl_global->compiled_marshaling (1);
                 }
+              else if (av[i][2] == 'C')
+                {
+                  // AMI with Call back.
+                  idl_global->ami_call_back (I_TRUE);
+                }
               else if (av[i][2] == 'i')
                 {
                   // interpretive marshaling support
@@ -741,7 +752,7 @@ DRV_parse_args (long ac, char **av)
       if (ACE_OS::access (tmpdir, F_OK | R_OK | W_OK) == -1)
 #endif /* ACE_MVS */
         {
-          cerr << GTDEVEL ("Error: Can't access temporary directory (")
+          cerr << GTDEVEL ("Warning: Can't access temporary directory (")
                << tmpdir
                << GTDEVEL ("), using current directory for temp files.\n");
           tmpdir = ".";
@@ -753,7 +764,7 @@ DRV_parse_args (long ac, char **av)
           if (ACE_OS::access (tmpdir, F_OK | R_OK | W_OK) == -1)
 #endif /* ACE_MVS */
             {
-              cerr << GTDEVEL ("Error: Can't access temporary directory (")
+              cerr << GTDEVEL ("Warning: Can't access temporary directory (")
                    << tmpdir
                    << "\n";
               ACE_OS::exit (99);
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index ba420be05aa..9825bf33cd9 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -342,7 +342,7 @@ DRV_pre_proc(const char *myfile)
       idl_global->set_filename(new UTL_String (myfile));
       idl_global->set_main_filename(new UTL_String (myfile));
       ACE_Auto_String_Free tmp (ACE_OS::strdup (myfile));
-      idl_global->set_stripped_filename(new UTL_String (DRV_stripped_name (tmp.get ())));
+      idl_global->set_stripped_filename(new UTL_String (tmp.get ()));
       idl_global->set_real_filename(new UTL_String (tmp_ifile));
     }
 
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index f819b16c881..ae9ba46a744 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -1,3 +1,4 @@
+
 %{
 /*  $Id$
 
@@ -169,42 +170,44 @@ oneway		return IDL_ONEWAY;
 		  return IDL_SCOPE_DELIMITOR;
 		}
 
-[a-ij-rs-zA-IJ-RS-Z][a-ij-rs-zA-IJ-RS-Z0-9_]*	{
-  // Make sure that this identifier is not a C++ keyword. If it is,
-  // prepend it with a _cxx_. Lookup in the perfect hash table for C++
-  // keyword and grab the mapping.  BTW, the reason for the odd
-  // regular expression is to handle EBCDIC, as well as ASCII.
-
-  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);
+[a-zA-Z][a-zA-Z0-9_]*	{
+    /* make sure that this identifier is not a C++ keyword. If it is,
+       prepend it with a _cxx_. Lookup in the perfect hash table for
+       C++ keyword and grab the mapping*/
 
-  return IDENTIFIER;
+    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);
+      }
+    return IDENTIFIER;
 }
 
-"-"?[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;
                 }
-"-"?[0-9]+[eE][+-]?[0-9]+[lLfF]?  {
+-?[0-9]+[eE][+-]?[0-9]+[lLfF]?  {
                   yylval.dval = idl_atof(ace_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
 
-"-"?[1-9][0-9]*	{
+-?[1-9][0-9]*	{
 		  yylval.ival = idl_atoi(ace_yytext, 10);
 		  return IDL_INTEGER_LITERAL;
 	        }
-"-"?0[xX][a-fA-F0-9]+ {
+-?0[xX][a-fA-F0-9]+ {
 		  yylval.ival = idl_atoi(ace_yytext, 16);
 		  return IDL_INTEGER_LITERAL;
 	        }
-"-"?0[0-7]*	{
+-?0[0-7]*	{
 		  yylval.ival = idl_atoi(ace_yytext, 8);
 		  return IDL_INTEGER_LITERAL;
 	      	}
@@ -234,29 +237,23 @@ oneway		return IDL_ONEWAY;
 		  yylval.cval = idl_escape_reader(ace_yytext + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
-^#[ \t]*pragma[ \t].*{NL}	|
-^\?\?=[ \t]*pragma[ \t].*{NL}	{/* remember pragma */
+^#[ \t]*pragma[ \t].*{NL}	{/* remember pragma */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		  idl_store_pragma(ace_yytext);
 		}
-^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*{NL}		|
-^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*{NL}		{
+^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*{NL}		{
 		  idl_parse_line_and_file(ace_yytext);
 		}
-^#[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		|
-^\?\?=[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
+^#[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
 		  idl_parse_line_and_file(ace_yytext);
 		}
-^#line[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		|
-^\?\?=line[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
+^#line[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
 		  idl_parse_line_and_file(ace_yytext);
 		}
-^#[ \t]*[0-9]*{NL} |
-^\?\?=[ \t]*[0-9]*{NL} {
+^#[ \t]*[0-9]*{NL} {
 		  idl_parse_line_and_file(ace_yytext);
 	        }
-^#[ \t]*ident.*{NL}	|
-^\?\?=[ \t]*ident.*{NL}	{
+^#[ \t]*ident.*{NL}	{
 		  /* ignore cpp ident */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 2cac83600c9..2c6dc66d15d 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -281,52 +281,47 @@ static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] ));
 	tao_yy_flex_strncpy( tao_yytext, tao_yytext_ptr, tao_yyleng + 1 ); \
 	tao_yy_c_buf_p = tao_yy_cp;
 
-#define TAO_YY_NUM_RULES 76
-#define TAO_YY_END_OF_BUFFER 77
-static tao_yyconst short int tao_yy_accept[384] =
+#define TAO_YY_NUM_RULES 70
+#define TAO_YY_END_OF_BUFFER 71
+static tao_yyconst short int tao_yy_accept[339] =
     {   0,
-       73,   73,   77,   75,   73,   74,   74,   75,   75,   75,
-       75,   53,   51,   75,   75,   75,   48,   48,   48,   48,
+       67,   67,   71,   69,   67,   68,   68,   69,   69,   69,
+       69,   53,   51,   69,   69,   69,   48,   48,   48,   48,
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   75,   74,   73,
-        0,   54,    0,    0,   53,   51,   72,    0,   49,   53,
-        0,    0,    0,   51,   47,   45,   46,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,   69,   67,    0,
+       54,    0,    0,   53,   51,   66,    0,   49,   53,    0,
+        0,    0,   51,   47,   45,   46,   48,   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,   42,   48,   48,   48,   48,   48,   48,   48,
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,    0,   67,    0,    0,
+       48,   48,   48,   48,   48,    0,   63,    0,    0,    0,
 
-        0,    0,    0,    0,   55,    0,   55,    0,    0,    0,
-       71,   71,   49,    0,   49,    0,   50,   52,   48,   48,
-       48,    1,   48,   48,   48,   48,   48,   48,   48,   48,
+        0,    0,   55,    0,   55,    0,    0,    0,   65,   65,
+       49,    0,   49,    0,   50,   52,   48,   48,   48,    1,
        48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   43,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,    0,
-        0,    0,    0,    0,    0,   58,   56,    0,    0,    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,   43,
+       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
+       48,   48,   48,   48,   48,   48,   48,    0,    0,    0,
+        0,    0,   58,   56,    0,    0,    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,
-       29,   48,   48,    0,    0,    0,    0,    0,    0,   68,
+
+       48,   48,   48,   48,   48,   48,   48,   29,   48,   48,
         0,    0,    0,    0,    0,   56,    0,   57,    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,   63,    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,   61,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       48,   26,   48,   61,    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,   60,    0,    0,    0,    0,    0,
         0,   48,   48,   27,    7,   19,   48,   48,   34,   48,
-       48,   48,   48,   10,   48,   48,   14,    0,   69,   69,
-        0,    0,    0,   64,    0,    0,    0,    0,   31,   48,
-       48,   48,    4,   15,   36,   48,   24,   48,    0,    0,
-        0,   62,    0,    0,    0,    0,    0,    0,    5,    6,
-        8,   48,   38,   65,    0,   59,   59,    0,   70,   70,
-        0,    0,    0,   48,    0,    0,    0,   37,   66,    0,
-       60,   60,    0
+
+       48,   48,   48,   10,   48,   48,   14,    0,   64,   64,
+        0,    0,    0,   31,   48,   48,   48,    4,   15,   36,
+       48,   24,   48,    0,    0,    0,    5,    6,    8,   48,
+       38,   62,    0,   59,   59,   48,   37,    0
     } ;
 
 static tao_yyconst int tao_yy_ec[256] =
@@ -337,14 +332,14 @@ static tao_yyconst int tao_yy_ec[256] =
         1,    5,    1,    6,    7,    1,    1,    1,    8,    1,
         1,    9,   10,    1,   11,   12,   13,   14,   15,   15,
        15,   15,   15,   15,   15,   16,   16,   17,    1,   18,
-       19,   20,   21,    1,   22,   23,   23,   23,   24,   25,
-       26,   26,   26,   26,   26,   27,   26,   26,   26,   26,
-       26,   28,   29,   30,   31,   26,   26,   32,   26,   26,
-        1,   33,    1,    1,   34,    1,   35,   36,   37,   38,
-
-       39,   40,   41,   42,   43,   26,   26,   44,   45,   46,
-       47,   48,   49,   50,   51,   52,   53,   54,   55,   56,
-       57,   26,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,   19,    4,    1,   20,   21,   21,   21,   22,   23,
+       24,   24,   24,   24,   24,   25,   24,   24,   24,   24,
+       24,   26,   27,   28,   29,   24,   24,   30,   24,   24,
+        1,   31,    1,    1,   32,    1,   33,   34,   35,   36,
+
+       37,   38,   39,   40,   41,   24,   24,   42,   43,   44,
+       45,   46,   47,   48,   49,   50,   51,   52,   53,   54,
+       55,   24,    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,
@@ -361,278 +356,234 @@ static tao_yyconst int tao_yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static tao_yyconst int tao_yy_meta[58] =
+static tao_yyconst int tao_yy_meta[56] =
     {   0,
         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,
+        1,    1,    1,    4,    4,    4,    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,    5,    5
+        5,    5,    5,    5,    5
     } ;
 
-static tao_yyconst short int tao_yy_base[400] =
+static tao_yyconst short int tao_yy_base[351] =
     {   0,
-        0,   51,  663,  664,   57,  664,  664,  656,  628,   49,
-       57,   59,   64,  643,  641,  638,    0,  635,  628,   41,
-      608,   47,   21,   39,  610,  607,  605,  604,  615,   44,
-       46,   66,   65,   52,  603,   75,   55,  121,  627,  106,
-      641,  664,  638,  119,  116,  129,  664,  135,  162,  146,
-      168,  180,    0,  196,  664,  664,  664,    0,  618,  613,
-      592,  585,  589,  593,  588,  603,  591,  585,  595,  581,
-      580,  595,  584,   69,  584,  591,  576,  575,  587,  573,
-      581,  587,  579,  586,  571,  572,  568,  569,  573,  562,
-      566,   18,  569,  569,  569,  558,  565,  664,  108,  200,
-
-      570,  564,  556,  586,  664,  596,  595,  159,  594,  196,
-      664,  215,    0,  212,  664,  215,  218,    0,  572,  576,
-      547,    0,  548,  553,  557,  545,   95,  542,  558,  556,
-      546,  551,  554,  536,  534,  547,  544,  531,  540,  543,
-      526,    0,  526,  535,  527,  539,  523,  525,   76,  526,
-      521,  526,  532,  523,  526,  515,  529,  531,  515,  558,
-      557,  523,  515,  525,  261,  664,  664,  232,  551,  223,
-      234,  664,  534,    0,  507,  513,  516,    0,    0,  502,
-      514,  505,  498,  506,    0,  501,  496,    0,  495,  496,
-        0,  501,  490,  491,  507,  506,  497,  500,  491,  498,
-
-      484,  489,  497,  486,  495,  494,  492,  483,  487,  488,
-        0,  476,  482,  518,  248,  477,  483,  480,  476,  664,
-      144,  276,  481,  475,  467,  664,  508,  664,  507,    0,
-      479,  477,  477,    0,  455,  465,  465,  469,  455,    0,
-        0,  466,  466,  465,    0,  446,  450,  464,  449,  453,
-      452,    0,  456,  444,  445,  452,  458,  453,    0,  445,
-      438,    0,  443,  664,  280,  436,  284,  442,  480,  479,
-      393,  379,  382,  379,  361,  366,  358,    0,  356,    0,
-      363,  370,    0,    0,    0,  365,    0,    0,  359,  365,
-        0,    0,  324,    0,  321,  327,  326,  303,  315,  664,
-
-      299,  221,  314,  319,  322,  306,  333,  251,  280,  279,
-      276,  260,  259,    0,    0,    0,  263,  271,    0,  250,
-      267,  242,  252,    0,  235,  212,    0,  264,  664,  267,
-      251,  238,  152,  664,  328,  189,  343,  168,    0,  170,
-      152,  158,    0,    0,    0,  157,    0,  142,  173,  319,
-      343,  664,  347,  349,  364,  369,  372,  136,    0,    0,
-        0,  115,    0,  664,  351,  664,  378,  386,  664,  388,
-      143,  107,  161,   47,   78,  390,  392,    0,  664,  394,
-      664,  397,  664,  418,  423,  425,  430,  435,   63,  438,
-      442,  445,  449,  454,  459,  464,  469,  474,  479
-
+        0,  518,  524,  526,   54,  526,  526,  517,  491,   46,
+       54,   54,   59,  504,  502,  500,    0,  498,  491,   38,
+      471,   47,   20,   35,  473,  470,  468,  467,  478,   42,
+       46,   62,   63,   30,  466,   57,   66,  115,  102,  503,
+      526,  500,   97,  110,  121,  526,  106,  151,  138,  165,
+      180,    0,  170,  526,  526,  526,    0,  482,  477,  456,
+      449,  453,  457,  452,  467,  455,  449,  459,  445,  444,
+      459,  448,  118,  448,  455,  440,  439,  451,  437,  445,
+      451,  443,  450,  435,  436,  432,  433,  437,  426,  430,
+       93,  433,  433,  433,  422,  429,  526,  156,  196,  434,
+
+      428,  420,  526,  459,  458,  130,  457,  145,  526,  166,
+        0,  203,  526,  189,  206,    0,  437,  441,  412,    0,
+      413,  418,  422,  410,  122,  407,  423,  421,  411,  416,
+      419,  401,  399,  412,  409,  396,  405,  408,  391,    0,
+      391,  400,  392,  404,  388,  390,  165,  391,  386,  391,
+      397,  388,  391,  380,  394,  396,  380,  421,  420,  388,
+      380,  390,  526,  526,  218,  414,  209,  220,  526,  399,
+        0,  372,  378,  381,    0,    0,  367,  379,  370,  363,
+      371,    0,  366,  361,    0,  360,  361,    0,  366,  355,
+      356,  372,  371,  362,  365,  356,  363,  349,  354,  362,
+
+      351,  360,  359,  357,  348,  352,  353,    0,  341,  347,
+      381,  234,  342,  348,  345,  526,  375,  526,  374,    0,
+      348,  346,  346,    0,  324,  334,  334,  338,  324,    0,
+        0,  335,  335,  334,    0,  315,  319,  333,  318,  322,
+      321,    0,  325,  313,  314,  321,  327,  322,    0,  314,
+      307,    0,  312,  526,  237,  305,  245,  311,  318,  301,
+      307,  300,    0,  299,    0,  307,  314,    0,    0,    0,
+      309,    0,    0,  303,  309,    0,    0,  293,    0,  292,
+      303,  303,  284,  299,  526,  251,  205,  266,  270,  273,
+      272,  248,  233,    0,    0,    0,  234,  242,    0,  187,
+
+      193,  166,  164,    0,  147,  132,    0,  224,  526,  253,
+      149,  140,  244,    0,  104,   95,   91,    0,    0,    0,
+       89,    0,   84,  100,  260,  266,    0,    0,    0,   41,
+        0,  526,  270,  526,  287,   27,    0,  526,  291,  296,
+      298,  303,  308,   54,  311,  315,  318,  322,  327,  332
     } ;
 
-static tao_yyconst short int tao_yy_def[400] =
+static tao_yyconst short int tao_yy_def[351] =
     {   0,
-      383,    1,  383,  383,  383,  383,  383,  384,  385,  383,
-      383,  383,  383,  383,  383,  383,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  383,  383,  383,
-      384,  383,  383,  387,  383,  383,  383,  388,  383,  383,
-      383,  383,  389,  383,  383,  383,  383,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,   38,  383,   38,  383,
-
-      383,  383,  383,  383,  383,  383,  383,  383,  390,  388,
-      383,  388,   49,  383,  383,  383,  383,  389,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  391,
-      383,  383,  383,  383,  383,  383,  383,  383,  392,  383,
-      383,  383,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  391,  383,  383,  383,  383,  165,  383,
-      165,  383,  383,  383,  383,  383,  383,  383,  383,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  383,  383,  383,  383,  383,  393,  383,
-      383,  383,  383,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  386,  383,
-
-      383,  394,  383,  383,  383,  383,  393,  383,  383,  383,
-      383,  386,  386,  386,  386,  386,  386,  386,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  394,  383,  394,
-      395,  383,  383,  383,  383,  383,  383,  383,  386,  386,
-      386,  386,  386,  386,  386,  386,  386,  386,  395,  383,
-      396,  383,  383,  397,  383,  383,  383,  383,  386,  386,
-      386,  386,  386,  383,  396,  383,  396,  397,  383,  397,
-      398,  383,  383,  386,  398,  383,  399,  386,  383,  399,
-      383,  399,    0,  383,  383,  383,  383,  383,  383,  383,
-      383,  383,  383,  383,  383,  383,  383,  383,  383
-
+      338,    1,  338,  338,  338,  338,  338,  339,  340,  338,
+      338,  338,  338,  338,  338,  338,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  338,  338,  339,
+      338,  338,  342,  338,  338,  338,  343,  338,  338,  338,
+      338,  344,  338,  338,  338,  338,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,   38,  338,   38,  338,  338,
+
+      338,  338,  338,  338,  338,  338,  345,  343,  338,  343,
+       48,  338,  338,  338,  338,  344,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  346,  338,  338,
+      338,  338,  338,  338,  338,  347,  338,  338,  338,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      346,  338,  338,  338,  338,  338,  338,  338,  338,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  338,  338,  338,  338,  338,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  341,  338,  338,  348,  338,  338,  338,
+      338,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+
+      341,  341,  341,  341,  341,  341,  341,  348,  338,  348,
+      349,  338,  338,  341,  341,  341,  341,  341,  341,  341,
+      341,  341,  341,  349,  338,  350,  341,  341,  341,  341,
+      341,  338,  350,  338,  350,  341,  341,    0,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338
     } ;
 
-static tao_yyconst short int tao_yy_nxt[722] =
+static tao_yyconst short int tao_yy_nxt[582] =
     {   0,
         4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
-       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,
-      154,   40,   45,   46,   46,   47,  118,   70,  155,   48,
-       49,   39,   50,   50,   51,   49,   61,   54,   54,   54,
-       78,   65,   52,  376,   71,  378,   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,  134,  371,  160,   53,  135,   87,   88,  202,   89,
-      136,   94,   97,   98,   98,   99,  107,   49,  203,   50,
-       50,   51,  108,  108,  100,  100,  100,  111,  112,   52,
-       49,   98,   54,   54,   54,  180,  181,   53,  376,  269,
-      109,  383,   52,  351,   52,  112,  351,   49,  374,   50,
-       50,   51,  377,  101,  102,  377,  167,   52,  103,   52,
-      373,   53,  168,  168,  109,  113,  113,  113,  350,   49,
-      363,   51,   51,   51,   52,  114,  115,  383,  115,  116,
-      116,   52,  362,  117,  117,  117,  361,  360,  111,  112,
-
-      114,  115,   98,   98,  161,  115,   52,   49,  359,   54,
-       54,   54,  358,  100,  100,  100,  112,  111,  112,   52,
-       98,  170,  170,  329,  330,  171,  171,  171,  117,  117,
-      117,  117,  117,  117,   52,  112,  171,  171,  171,  226,
-      354,  330,  172,  331,  172,  227,  227,  171,  171,  171,
-      264,  264,  265,  334,  334,  335,  350,  172,  115,  348,
-      115,  172,  219,  220,  220,  221,  329,  330,  264,  329,
-      330,  334,  347,  115,  222,  222,  222,  115,  220,  220,
-      270,  220,  300,  300,  330,  303,  346,  330,  304,  222,
-      222,  222,  345,  301,  301,  301,  220,  305,  305,  305,
-
-      300,  300,  300,  223,  224,  344,  343,  342,  225,  341,
-      340,  339,  301,  301,  301,  303,  338,  337,  304,  300,
-      303,  364,  364,  304,  331,  336,  332,  305,  305,  305,
-      352,  352,  305,  305,  305,  305,  305,  305,  308,  364,
-      333,  353,  353,  353,  355,  366,  367,  356,  352,  352,
-      352,  369,  370,  366,  367,  327,  357,  357,  357,  326,
-      353,  353,  353,  367,  325,  355,  324,  352,  356,  370,
-      355,  367,  323,  356,  371,  322,  372,  357,  357,  357,
-      366,  367,  357,  357,  357,  357,  357,  357,  369,  370,
-      369,  370,  379,  379,  381,  382,  381,  382,  367,  381,
-
-      382,  321,  320,  319,  318,  317,  370,  316,  370,  315,
-      379,  314,  382,  313,  382,  312,  311,  382,   41,   41,
-       41,   41,   41,   43,  310,   43,   43,   43,   58,   58,
-      106,  309,  106,  106,  106,  110,  110,  110,  110,  110,
-      169,  169,  214,  214,  214,  214,  214,  229,  229,  307,
-      307,  307,  307,  307,  328,  328,  328,  328,  328,  349,
-      349,  349,  349,  349,  365,  365,  365,  365,  365,  368,
-      368,  368,  368,  368,  375,  375,  375,  375,  375,  380,
-      380,  380,  380,  380,  269,  308,  306,  302,  299,  298,
-      297,  296,  295,  294,  293,  292,  291,  290,  289,  288,
-
-      287,  286,  285,  284,  283,  282,  281,  280,  279,  278,
-      277,  276,  275,  274,  228,  226,  273,  272,  271,  383,
-      268,  267,  266,  215,  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,  233,  232,  231,  230,  228,  218,
-      217,  216,  160,  215,  213,  212,  211,  210,  209,  208,
-      207,  206,  205,  204,  201,  200,  199,  198,  197,  196,
+       10,    4,   11,   12,   13,   13,   14,   15,   16,   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,   39,   68,  116,   39,   44,
+       45,   45,   46,  337,   69,   48,   47,   49,   49,   50,
+       48,   60,   53,   53,   53,   51,   77,   89,   70,   64,
+       51,   61,  336,   52,   90,   78,   65,   62,   71,   92,
+       51,   66,   79,   80,   82,   51,   81,   67,   83,   84,
+
+       94,   93,   85,   39,  105,  325,   39,   52,  109,  110,
+      106,  106,   86,   87,   95,   88,   96,   97,   97,   98,
+      331,   48,  330,   49,   49,   50,  107,  329,   99,   99,
+       99,   51,   48,  152,   53,   53,   53,  164,  328,   52,
+      327,  153,   51,  165,  165,  311,   51,  109,  110,   48,
+      107,   49,   49,   50,  325,  100,  101,   51,  132,   51,
+      102,  158,  133,   52,  111,  111,  111,  134,  109,  110,
+      177,  178,  112,  113,   51,  113,   48,  323,   50,   50,
+       50,   48,  322,   53,   53,   53,   51,  112,  113,  114,
+      114,   51,  113,  115,  115,  115,  321,  338,   97,   97,
+
+      159,   51,  115,  115,  115,  199,   51,  309,  310,   99,
+       99,   99,  167,  167,  320,  200,  168,  168,  168,  115,
+      115,  115,  168,  168,  168,  216,  309,  310,  169,  319,
+      169,  217,  217,  168,  168,  168,  254,  254,  255,  285,
+      285,  318,  113,  169,  113,  326,  288,  169,  326,  289,
+      286,  286,  286,  285,  285,  309,  310,  113,  290,  290,
+      290,  113,  332,  332,  286,  286,  286,  288,  334,  335,
+      289,  288,  334,  335,  289,  311,  317,  312,  316,  290,
+      290,  290,  315,  290,  290,  290,  290,  290,  290,  334,
+      335,   40,   40,   40,   40,   40,   42,  314,   42,   42,
+
+       42,   57,   57,  104,  313,  104,  104,  104,  108,  108,
+      108,  108,  108,  166,  166,  211,  211,  211,  211,  211,
+      219,  219,  308,  308,  308,  308,  308,  324,  324,  324,
+      324,  324,  333,  333,  333,  333,  333,  307,  306,  305,
+      304,  303,  302,  301,  300,  299,  298,  297,  296,  295,
+      294,  293,  292,  291,  287,  284,  283,  282,  281,  280,
+      279,  278,  277,  276,  275,  274,  273,  272,  271,  270,
+      269,  268,  267,  266,  265,  264,  263,  262,  261,  260,
+      259,  218,  216,  258,  257,  256,  212,  253,  252,  251,
+      250,  249,  248,  247,  246,  245,  244,  243,  242,  241,
+
+      240,  239,  238,  237,  236,  235,  234,  233,  232,  231,
+      230,  229,  228,  227,  226,  225,  224,  223,  222,  221,
+      220,  218,  215,  214,  213,  158,  212,  210,  209,  208,
+      207,  206,  205,  204,  203,  202,  201,  198,  197,  196,
       195,  194,  193,  192,  191,  190,  189,  188,  187,  186,
-      185,  184,  183,  182,  179,  178,  177,  176,  175,  174,
-
-      173,  166,  166,  166,  165,  164,  163,  162,  383,  159,
-      158,  157,  156,  153,  152,  151,  150,  149,  148,  147,
+      185,  184,  183,  182,  181,  180,  179,  176,  175,  174,
+      173,  172,  171,  170,  163,  163,  163,  162,  161,  160,
+      338,  157,  156,  155,  154,  151,  150,  149,  148,  147,
       146,  145,  144,  143,  142,  141,  140,  139,  138,  137,
-      133,  132,  131,  130,  129,  128,  127,  126,  125,  124,
-      123,  122,  121,  120,  119,  105,   42,  104,   92,   77,
-       76,   75,   74,   73,   64,   60,   59,   57,   56,   55,
-       44,   42,  383,    3,  383,  383,  383,  383,  383,  383,
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-      383
+      136,  135,  131,  130,  129,  128,  127,  126,  125,  124,
+
+      123,  122,  121,  120,  119,  118,  117,  103,   41,   91,
+       76,   75,   74,   73,   72,   63,   59,   58,   56,   55,
+       54,   43,   41,  338,   38,    3,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338
     } ;
 
-static tao_yyconst short int tao_yy_chk[722] =
+static tao_yyconst short int tao_yy_chk[582] =
     {   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,   23,
-       92,    5,   10,   10,   10,   11,  389,   23,   92,   11,
-       12,    2,   12,   12,   12,   13,   20,   13,   13,   13,
-       30,   22,   12,  375,   24,  374,   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,  372,   99,   12,   74,   33,   33,  149,   33,
-       74,   36,   38,   38,   38,   38,   44,   45,  149,   45,
-       45,   45,   44,   44,   38,   38,   38,   48,   48,   45,
-       46,   38,   46,   46,   46,  127,  127,   45,  371,  221,
-       44,   99,   46,  333,   45,   48,  333,   50,  362,   50,
-       50,   50,  373,   38,   38,  373,  108,   46,   38,   50,
-      358,   45,  108,  108,   44,   49,   49,   49,  349,   51,
-      348,   51,   51,   51,   50,   49,   49,  221,   49,   52,
-       52,   51,  346,   52,   52,   52,  342,  341,  110,  110,
-
-       49,   49,  100,  100,  100,   49,   51,   54,  340,   54,
-       54,   54,  338,  100,  100,  100,  110,  112,  112,   54,
-      100,  114,  114,  302,  302,  114,  114,  114,  116,  116,
-      116,  117,  117,  117,   54,  112,  170,  170,  170,  168,
-      336,  302,  117,  332,  117,  168,  168,  171,  171,  171,
-      215,  215,  215,  308,  308,  308,  331,  117,  171,  326,
-      171,  117,  165,  165,  165,  165,  328,  328,  215,  330,
-      330,  308,  325,  171,  165,  165,  165,  171,  222,  222,
-      222,  165,  265,  265,  328,  267,  323,  330,  267,  222,
-      222,  222,  322,  265,  265,  265,  222,  267,  267,  267,
-
-      265,  301,  301,  165,  165,  321,  320,  318,  165,  317,
-      313,  312,  301,  301,  301,  303,  311,  310,  303,  301,
-      304,  350,  350,  304,  304,  309,  305,  303,  303,  303,
-      335,  335,  304,  304,  304,  305,  305,  305,  307,  350,
-      306,  335,  335,  335,  337,  351,  351,  337,  335,  353,
-      353,  354,  354,  365,  365,  299,  337,  337,  337,  298,
-      353,  353,  353,  351,  297,  355,  296,  353,  355,  354,
-      356,  365,  295,  356,  356,  293,  357,  355,  355,  355,
-      367,  367,  356,  356,  356,  357,  357,  357,  368,  368,
-      370,  370,  376,  376,  377,  377,  380,  380,  367,  382,
-
-      382,  290,  289,  286,  282,  281,  368,  279,  370,  277,
-      376,  276,  377,  275,  380,  274,  273,  382,  384,  384,
-      384,  384,  384,  385,  272,  385,  385,  385,  386,  386,
-      387,  271,  387,  387,  387,  388,  388,  388,  388,  388,
-      390,  390,  391,  391,  391,  391,  391,  392,  392,  393,
-      393,  393,  393,  393,  394,  394,  394,  394,  394,  395,
-      395,  395,  395,  395,  396,  396,  396,  396,  396,  397,
-      397,  397,  397,  397,  398,  398,  398,  398,  398,  399,
-      399,  399,  399,  399,  270,  269,  268,  266,  263,  261,
-      260,  258,  257,  256,  255,  254,  253,  251,  250,  249,
-
-      248,  247,  246,  244,  243,  242,  239,  238,  237,  236,
-      235,  233,  232,  231,  229,  227,  225,  224,  223,  219,
-      218,  217,  216,  214,  213,  212,  210,  209,  208,  207,
+        1,    1,    1,    1,    1,    5,   23,  344,    5,   10,
+       10,   10,   11,  336,   23,   12,   11,   12,   12,   12,
+       13,   20,   13,   13,   13,   12,   30,   34,   24,   22,
+       13,   20,  330,   12,   34,   30,   22,   20,   24,   36,
+       12,   22,   30,   31,   32,   13,   31,   22,   32,   33,
+
+       37,   36,   33,   39,   43,  324,   39,   12,   47,   47,
+       43,   43,   33,   33,   37,   33,   38,   38,   38,   38,
+      323,   44,  321,   44,   44,   44,   43,  317,   38,   38,
+       38,   44,   45,   91,   45,   45,   45,  106,  316,   44,
+      315,   91,   45,  106,  106,  312,   44,  108,  108,   49,
+       43,   49,   49,   49,  311,   38,   38,   45,   73,   49,
+       38,   98,   73,   44,   48,   48,   48,   73,  110,  110,
+      125,  125,   48,   48,   49,   48,   50,  306,   50,   50,
+       50,   53,  305,   53,   53,   53,   50,   48,   48,   51,
+       51,   53,   48,   51,   51,   51,  303,   98,   99,   99,
+
+       99,   50,  114,  114,  114,  147,   53,  287,  287,   99,
+       99,   99,  112,  112,  302,  147,  112,  112,  112,  115,
+      115,  115,  167,  167,  167,  165,  308,  308,  115,  301,
+      115,  165,  165,  168,  168,  168,  212,  212,  212,  255,
+      255,  300,  168,  115,  168,  313,  257,  115,  313,  257,
+      255,  255,  255,  286,  286,  310,  310,  168,  257,  257,
+      257,  168,  325,  325,  286,  286,  286,  288,  326,  326,
+      288,  289,  333,  333,  289,  289,  298,  290,  297,  288,
+      288,  288,  293,  289,  289,  289,  290,  290,  290,  335,
+      335,  339,  339,  339,  339,  339,  340,  292,  340,  340,
+
+      340,  341,  341,  342,  291,  342,  342,  342,  343,  343,
+      343,  343,  343,  345,  345,  346,  346,  346,  346,  346,
+      347,  347,  348,  348,  348,  348,  348,  349,  349,  349,
+      349,  349,  350,  350,  350,  350,  350,  284,  283,  282,
+      281,  280,  278,  275,  274,  271,  267,  266,  264,  262,
+      261,  260,  259,  258,  256,  253,  251,  250,  248,  247,
+      246,  245,  244,  243,  241,  240,  239,  238,  237,  236,
+      234,  233,  232,  229,  228,  227,  226,  225,  223,  222,
+      221,  219,  217,  215,  214,  213,  211,  210,  209,  207,
       206,  205,  204,  203,  202,  201,  200,  199,  198,  197,
-      196,  195,  194,  193,  192,  190,  189,  187,  186,  184,
-      183,  182,  181,  180,  177,  176,  175,  173,  169,  164,
-      163,  162,  161,  160,  159,  158,  157,  156,  155,  154,
-      153,  152,  151,  150,  148,  147,  146,  145,  144,  143,
-      141,  140,  139,  138,  137,  136,  135,  134,  133,  132,
-      131,  130,  129,  128,  126,  125,  124,  123,  121,  120,
-
-      119,  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,  383,  383,  383,  383,  383,  383,  383,
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-      383,  383,  383,  383,  383,  383,  383,  383,  383,  383,
-      383
+
+      196,  195,  194,  193,  192,  191,  190,  189,  187,  186,
+      184,  183,  181,  180,  179,  178,  177,  174,  173,  172,
+      170,  166,  162,  161,  160,  159,  158,  157,  156,  155,
+      154,  153,  152,  151,  150,  149,  148,  146,  145,  144,
+      143,  142,  141,  139,  138,  137,  136,  135,  134,  133,
+      132,  131,  130,  129,  128,  127,  126,  124,  123,  122,
+      121,  119,  118,  117,  107,  105,  104,  102,  101,  100,
+       96,   95,   94,   93,   92,   90,   89,   88,   87,   86,
+       85,   84,   83,   82,   81,   80,   79,   78,   77,   76,
+       75,   74,   72,   71,   70,   69,   68,   67,   66,   65,
+
+       64,   63,   62,   61,   60,   59,   58,   42,   40,   35,
+       29,   28,   27,   26,   25,   21,   19,   18,   16,   15,
+       14,    9,    8,    3,    2,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
+      338
     } ;
 
 static tao_yy_state_type tao_yy_last_accepting_state;
@@ -653,8 +604,8 @@ char tao_yytext[TAO_YYLMAX];
 char *tao_yytext_ptr;
 #line 1 "fe/idl.ll"
 #define INITIAL 0
-#line 2 "fe/idl.ll"
-/*  $Id: idl.ll,v 1.32 1999/06/12 04:56:38 schmidt Exp $
+#line 3 "fe/idl.ll"
+/*  $Id: idl.ll,v 1.30 1999/06/06 22:04:06 schmidt Exp $
 
 COPYRIGHT
 
@@ -914,7 +865,7 @@ TAO_YY_DECL
 	register char *tao_yy_cp, *tao_yy_bp;
 	register int tao_yy_act;
 
-#line 116 "fe/idl.ll"
+#line 117 "fe/idl.ll"
 
 
 
@@ -968,13 +919,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 >= 384 )
+				if ( tao_yy_current_state >= 339 )
 					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] != 664 );
+		while ( tao_yy_base[tao_yy_current_state] != 526 );
 
 tao_yy_find_action:
 		tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -1002,237 +953,237 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 TAO_YY_RULE_SETUP
-#line 118 "fe/idl.ll"
+#line 119 "fe/idl.ll"
 return IDL_ANY;
 	TAO_YY_BREAK
 case 2:
 TAO_YY_RULE_SETUP
-#line 119 "fe/idl.ll"
+#line 120 "fe/idl.ll"
 return IDL_MODULE;
 	TAO_YY_BREAK
 case 3:
 TAO_YY_RULE_SETUP
-#line 120 "fe/idl.ll"
+#line 121 "fe/idl.ll"
 return IDL_RAISES;
 	TAO_YY_BREAK
 case 4:
 TAO_YY_RULE_SETUP
-#line 121 "fe/idl.ll"
+#line 122 "fe/idl.ll"
 return IDL_READONLY;
 	TAO_YY_BREAK
 case 5:
 TAO_YY_RULE_SETUP
-#line 122 "fe/idl.ll"
+#line 123 "fe/idl.ll"
 return IDL_ATTRIBUTE;
 	TAO_YY_BREAK
 case 6:
 TAO_YY_RULE_SETUP
-#line 123 "fe/idl.ll"
+#line 124 "fe/idl.ll"
 return IDL_EXCEPTION;
 	TAO_YY_BREAK
 case 7:
 TAO_YY_RULE_SETUP
-#line 124 "fe/idl.ll"
+#line 125 "fe/idl.ll"
 return IDL_CONTEXT;
 	TAO_YY_BREAK
 case 8:
 TAO_YY_RULE_SETUP
-#line 125 "fe/idl.ll"
+#line 126 "fe/idl.ll"
 return IDL_INTERFACE;
 	TAO_YY_BREAK
 case 9:
 TAO_YY_RULE_SETUP
-#line 126 "fe/idl.ll"
+#line 127 "fe/idl.ll"
 return IDL_CONST;
 	TAO_YY_BREAK
 case 10:
 TAO_YY_RULE_SETUP
-#line 127 "fe/idl.ll"
+#line 128 "fe/idl.ll"
 return IDL_TYPEDEF;
 	TAO_YY_BREAK
 case 11:
 TAO_YY_RULE_SETUP
-#line 128 "fe/idl.ll"
+#line 129 "fe/idl.ll"
 return IDL_STRUCT;
 	TAO_YY_BREAK
 case 12:
 TAO_YY_RULE_SETUP
-#line 129 "fe/idl.ll"
+#line 130 "fe/idl.ll"
 return IDL_ENUM;
 	TAO_YY_BREAK
 case 13:
 TAO_YY_RULE_SETUP
-#line 130 "fe/idl.ll"
+#line 131 "fe/idl.ll"
 return IDL_STRING;
 	TAO_YY_BREAK
 case 14:
 TAO_YY_RULE_SETUP
-#line 131 "fe/idl.ll"
+#line 132 "fe/idl.ll"
 return IDL_WSTRING;
 	TAO_YY_BREAK
 case 15:
 TAO_YY_RULE_SETUP
-#line 132 "fe/idl.ll"
+#line 133 "fe/idl.ll"
 return IDL_SEQUENCE;
 	TAO_YY_BREAK
 case 16:
 TAO_YY_RULE_SETUP
-#line 133 "fe/idl.ll"
+#line 134 "fe/idl.ll"
 return IDL_UNION;
 	TAO_YY_BREAK
 case 17:
 TAO_YY_RULE_SETUP
-#line 134 "fe/idl.ll"
+#line 135 "fe/idl.ll"
 return IDL_SWITCH;
 	TAO_YY_BREAK
 case 18:
 TAO_YY_RULE_SETUP
-#line 135 "fe/idl.ll"
+#line 136 "fe/idl.ll"
 return IDL_CASE;
 	TAO_YY_BREAK
 case 19:
 TAO_YY_RULE_SETUP
-#line 136 "fe/idl.ll"
+#line 137 "fe/idl.ll"
 return IDL_DEFAULT;
 	TAO_YY_BREAK
 case 20:
 TAO_YY_RULE_SETUP
-#line 137 "fe/idl.ll"
+#line 138 "fe/idl.ll"
 return IDL_FLOAT;
 	TAO_YY_BREAK
 case 21:
 TAO_YY_RULE_SETUP
-#line 138 "fe/idl.ll"
+#line 139 "fe/idl.ll"
 return IDL_DOUBLE;
 	TAO_YY_BREAK
 case 22:
 TAO_YY_RULE_SETUP
-#line 139 "fe/idl.ll"
+#line 140 "fe/idl.ll"
 return IDL_LONG;
 	TAO_YY_BREAK
 case 23:
 TAO_YY_RULE_SETUP
-#line 140 "fe/idl.ll"
+#line 141 "fe/idl.ll"
 return IDL_SHORT;
 	TAO_YY_BREAK
 case 24:
 TAO_YY_RULE_SETUP
-#line 141 "fe/idl.ll"
+#line 142 "fe/idl.ll"
 return IDL_UNSIGNED;
 	TAO_YY_BREAK
 case 25:
 TAO_YY_RULE_SETUP
-#line 142 "fe/idl.ll"
+#line 143 "fe/idl.ll"
 return IDL_CHAR;
 	TAO_YY_BREAK
 case 26:
 TAO_YY_RULE_SETUP
-#line 143 "fe/idl.ll"
+#line 144 "fe/idl.ll"
 return IDL_WCHAR;
 	TAO_YY_BREAK
 case 27:
 TAO_YY_RULE_SETUP
-#line 144 "fe/idl.ll"
+#line 145 "fe/idl.ll"
 return IDL_BOOLEAN;
 	TAO_YY_BREAK
 case 28:
 TAO_YY_RULE_SETUP
-#line 145 "fe/idl.ll"
+#line 146 "fe/idl.ll"
 return IDL_OCTET;
 	TAO_YY_BREAK
 case 29:
 TAO_YY_RULE_SETUP
-#line 146 "fe/idl.ll"
+#line 147 "fe/idl.ll"
 return IDL_VOID;
 	TAO_YY_BREAK
 case 30:
 TAO_YY_RULE_SETUP
-#line 147 "fe/idl.ll"
+#line 148 "fe/idl.ll"
 return IDL_NATIVE;
 	TAO_YY_BREAK
 case 31:
 TAO_YY_RULE_SETUP
-#line 148 "fe/idl.ll"
+#line 149 "fe/idl.ll"
 return scan_obv_token (IDL_ABSTRACT);
 	TAO_YY_BREAK
 case 32:
 TAO_YY_RULE_SETUP
-#line 149 "fe/idl.ll"
+#line 150 "fe/idl.ll"
 return scan_obv_token (IDL_CUSTOM);
 	TAO_YY_BREAK
 case 33:
 TAO_YY_RULE_SETUP
-#line 150 "fe/idl.ll"
+#line 151 "fe/idl.ll"
 return scan_obv_token (IDL_INIT);
 	TAO_YY_BREAK
 case 34:
 TAO_YY_RULE_SETUP
-#line 151 "fe/idl.ll"
+#line 152 "fe/idl.ll"
 return scan_obv_token (IDL_PRIVATE);
 	TAO_YY_BREAK
 case 35:
 TAO_YY_RULE_SETUP
-#line 152 "fe/idl.ll"
+#line 153 "fe/idl.ll"
 return scan_obv_token (IDL_PUBLIC);
 	TAO_YY_BREAK
 case 36:
 TAO_YY_RULE_SETUP
-#line 153 "fe/idl.ll"
+#line 154 "fe/idl.ll"
 return scan_obv_token (IDL_SUPPORTS);
 	TAO_YY_BREAK
 case 37:
 TAO_YY_RULE_SETUP
-#line 154 "fe/idl.ll"
+#line 155 "fe/idl.ll"
 return scan_obv_token (IDL_TRUNCATABLE);
 	TAO_YY_BREAK
 case 38:
 TAO_YY_RULE_SETUP
-#line 155 "fe/idl.ll"
+#line 156 "fe/idl.ll"
 return scan_obv_token (IDL_VALUETYPE);
 	TAO_YY_BREAK
 case 39:
 TAO_YY_RULE_SETUP
-#line 157 "fe/idl.ll"
+#line 158 "fe/idl.ll"
 return IDL_TRUETOK;
 	TAO_YY_BREAK
 case 40:
 TAO_YY_RULE_SETUP
-#line 158 "fe/idl.ll"
+#line 159 "fe/idl.ll"
 return IDL_FALSETOK;
 	TAO_YY_BREAK
 case 41:
 TAO_YY_RULE_SETUP
-#line 160 "fe/idl.ll"
+#line 161 "fe/idl.ll"
 return IDL_INOUT;
 	TAO_YY_BREAK
 case 42:
 TAO_YY_RULE_SETUP
-#line 161 "fe/idl.ll"
+#line 162 "fe/idl.ll"
 return IDL_IN;
 	TAO_YY_BREAK
 case 43:
 TAO_YY_RULE_SETUP
-#line 162 "fe/idl.ll"
+#line 163 "fe/idl.ll"
 return IDL_OUT;
 	TAO_YY_BREAK
 case 44:
 TAO_YY_RULE_SETUP
-#line 163 "fe/idl.ll"
+#line 164 "fe/idl.ll"
 return IDL_ONEWAY;
 	TAO_YY_BREAK
 case 45:
 TAO_YY_RULE_SETUP
-#line 165 "fe/idl.ll"
+#line 166 "fe/idl.ll"
 return IDL_LEFT_SHIFT;
 	TAO_YY_BREAK
 case 46:
 TAO_YY_RULE_SETUP
-#line 166 "fe/idl.ll"
+#line 167 "fe/idl.ll"
 return IDL_RIGHT_SHIFT;
 	TAO_YY_BREAK
 case 47:
 TAO_YY_RULE_SETUP
-#line 167 "fe/idl.ll"
+#line 168 "fe/idl.ll"
 {
 		  tao_yylval.strval = (char *) "::";
 		  return IDL_SCOPE_DELIMITOR;
@@ -1240,28 +1191,30 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 48:
 TAO_YY_RULE_SETUP
-#line 172 "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++
-  // keyword and grab the mapping.  BTW, the reason for the odd
-  // regular expression is to handle EBCDIC, as well as ASCII.
-
-  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);
-
-  return IDENTIFIER;
+    /* make sure that this identifier is not a C++ keyword. If it is,
+       prepend it with a _cxx_. Lookup in the perfect hash table for
+       C++ keyword and grab the mapping*/
+
+    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);
+      }
+    return IDENTIFIER;
 }
 	TAO_YY_BREAK
 case 49:
 TAO_YY_RULE_SETUP
-#line 190 "fe/idl.ll"
+#line 193 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof(ace_tao_yytext);
                   return IDL_FLOATING_PT_LITERAL;
@@ -1269,7 +1222,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 50:
 TAO_YY_RULE_SETUP
-#line 194 "fe/idl.ll"
+#line 197 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof(ace_tao_yytext);
                   return IDL_FLOATING_PT_LITERAL;
@@ -1277,7 +1230,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 51:
 TAO_YY_RULE_SETUP
-#line 199 "fe/idl.ll"
+#line 202 "fe/idl.ll"
 {
 		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 10);
 		  return IDL_INTEGER_LITERAL;
@@ -1285,7 +1238,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 52:
 TAO_YY_RULE_SETUP
-#line 203 "fe/idl.ll"
+#line 206 "fe/idl.ll"
 {
 		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 16);
 		  return IDL_INTEGER_LITERAL;
@@ -1293,7 +1246,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 53:
 TAO_YY_RULE_SETUP
-#line 207 "fe/idl.ll"
+#line 210 "fe/idl.ll"
 {
 		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 8);
 		  return IDL_INTEGER_LITERAL;
@@ -1301,7 +1254,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 54:
 TAO_YY_RULE_SETUP
-#line 212 "fe/idl.ll"
+#line 215 "fe/idl.ll"
 {
 		  /* Skip the quotes */
 		  char *tmp = ace_tao_yytext;
@@ -1312,7 +1265,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 55:
 TAO_YY_RULE_SETUP
-#line 219 "fe/idl.ll"
+#line 222 "fe/idl.ll"
 {
 		  tao_yylval.cval = ace_tao_yytext [1];
 		  return IDL_CHARACTER_LITERAL;
@@ -1320,7 +1273,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 56:
 TAO_YY_RULE_SETUP
-#line 223 "fe/idl.ll"
+#line 226 "fe/idl.ll"
 {
 		  // octal character constant
 		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
@@ -1329,7 +1282,7 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 57:
 TAO_YY_RULE_SETUP
-#line 228 "fe/idl.ll"
+#line 231 "fe/idl.ll"
 {
 		  // hexadecimal character constant
 		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
@@ -1338,79 +1291,67 @@ TAO_YY_RULE_SETUP
 	TAO_YY_BREAK
 case 58:
 TAO_YY_RULE_SETUP
-#line 233 "fe/idl.ll"
+#line 236 "fe/idl.ll"
 {
 		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
 	TAO_YY_BREAK
 case 59:
-#line 238 "fe/idl.ll"
-case 60:
 TAO_YY_RULE_SETUP
-#line 238 "fe/idl.ll"
+#line 240 "fe/idl.ll"
 {/* remember pragma */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		  idl_store_pragma(ace_tao_yytext);
 		}
 	break;
-case 61:
-#line 243 "fe/idl.ll"
-case 62:
+case 60:
 TAO_YY_RULE_SETUP
-#line 243 "fe/idl.ll"
+#line 244 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 		}
 	break;
-case 63:
-#line 247 "fe/idl.ll"
-case 64:
+case 61:
 TAO_YY_RULE_SETUP
 #line 247 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 		}
 	break;
-case 65:
-#line 251 "fe/idl.ll"
-case 66:
+case 62:
 TAO_YY_RULE_SETUP
-#line 251 "fe/idl.ll"
+#line 250 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 		}
 	break;
-case 67:
-#line 255 "fe/idl.ll"
-case 68:
+case 63:
 TAO_YY_RULE_SETUP
-#line 255 "fe/idl.ll"
+#line 253 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 	        }
 	break;
-case 69:
-#line 259 "fe/idl.ll"
-case 70:
+case 64:
 TAO_YY_RULE_SETUP
-#line 259 "fe/idl.ll"
+#line 256 "fe/idl.ll"
 {
 		  /* ignore cpp ident */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	break;
-case 71:
+case 65:
 TAO_YY_RULE_SETUP
-#line 263 "fe/idl.ll"
+#line 260 "fe/idl.ll"
 {
 		  /* ignore comments */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	break;
-case 72:
+case 66:
 TAO_YY_RULE_SETUP
-#line 267 "fe/idl.ll"
+#line 264 "fe/idl.ll"
 {
 		  for(;;) {
 		    char c = tao_yyinput();
@@ -1426,28 +1367,28 @@ TAO_YY_RULE_SETUP
 	          }
 	        }
 	break;
-case 73:
+case 67:
 TAO_YY_RULE_SETUP
-#line 281 "fe/idl.ll"
+#line 278 "fe/idl.ll"
 ;
-	TAO_YY_BREAK
-case 74:
+	break;
+case 68:
 TAO_YY_RULE_SETUP
-#line 282 "fe/idl.ll"
+#line 279 "fe/idl.ll"
 {
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 	break;
-case 75:
+case 69:
 TAO_YY_RULE_SETUP
-#line 285 "fe/idl.ll"
+#line 282 "fe/idl.ll"
 return ace_tao_yytext [0];
 	TAO_YY_BREAK
-case 76:
+case 70:
 TAO_YY_RULE_SETUP
-#line 287 "fe/idl.ll"
+#line 284 "fe/idl.ll"
 TAO_YY_ECHO;
-	TAO_YY_BREAK
+	break;
 case TAO_YY_STATE_EOF(INITIAL):
 	tao_yyterminate();
 
@@ -1740,7 +1681,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 >= 384 )
+			if ( tao_yy_current_state >= 339 )
 				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];
@@ -1775,11 +1716,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 >= 384 )
+		if ( tao_yy_current_state >= 339 )
 			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 == 383);
+	tao_yy_is_jam = (tao_yy_current_state == 338);
 
 	return tao_yy_is_jam ? 0 : tao_yy_current_state;
 	}
@@ -2335,7 +2276,7 @@ int main()
 	return 0;
 	}
 #endif
-#line 287 "fe/idl.ll"
+#line 284 "fe/idl.ll"
 
 	/* subroutines */
 
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
index a7e27486c90..062d7890a14 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	Fri Jun 11 12:09:33 1999
-+++ lex.yy.cpp.new	Fri Jun 11 12:22:49 1999
-@@ -899,7 +899,7 @@
+--- lex.yy.cpp	Sun May 16 19:42:18 1999
++++ lex.yy.cpp.new	Sun May 16 19:40:55 1999
+@@ -850,7 +850,7 @@
  
  /* Code executed at the end of each rule. */
  #ifndef TAO_YY_BREAK
@@ -9,84 +9,94 @@
  #endif
  
  #define TAO_YY_RULE_SETUP \
-@@ -1353,7 +1353,7 @@
+@@ -1304,35 +1304,35 @@
    		  idl_global->set_lineno(idl_global->lineno() + 1);
  		  idl_store_pragma(ace_tao_yytext);
  		}
 -	TAO_YY_BREAK
 +	break;
- case 61:
- #line 243 "fe/idl.ll"
- case 62:
-@@ -1362,7 +1362,7 @@
+ case 60:
+ TAO_YY_RULE_SETUP
+ #line 244 "fe/idl.ll"
  {
  		  idl_parse_line_and_file(ace_tao_yytext);
  		}
 -	TAO_YY_BREAK
 +	break;
- case 63:
+ case 61:
+ TAO_YY_RULE_SETUP
  #line 247 "fe/idl.ll"
- case 64:
-@@ -1371,7 +1371,7 @@
  {
  		  idl_parse_line_and_file(ace_tao_yytext);
  		}
 -	TAO_YY_BREAK
 +	break;
- case 65:
- #line 251 "fe/idl.ll"
- case 66:
-@@ -1380,7 +1380,7 @@
+ case 62:
+ TAO_YY_RULE_SETUP
+ #line 250 "fe/idl.ll"
  {
  		  idl_parse_line_and_file(ace_tao_yytext);
  		}
 -	TAO_YY_BREAK
 +	break;
- case 67:
- #line 255 "fe/idl.ll"
- case 68:
-@@ -1389,7 +1389,7 @@
+ case 63:
+ TAO_YY_RULE_SETUP
+ #line 253 "fe/idl.ll"
  {
  		  idl_parse_line_and_file(ace_tao_yytext);
  	        }
 -	TAO_YY_BREAK
 +	break;
- case 69:
- #line 259 "fe/idl.ll"
- case 70:
-@@ -1399,7 +1399,7 @@
+ case 64:
+ TAO_YY_RULE_SETUP
+ #line 256 "fe/idl.ll"
+@@ -1340,7 +1340,7 @@
  		  /* ignore cpp ident */
    		  idl_global->set_lineno(idl_global->lineno() + 1);
  		}
 -	TAO_YY_BREAK
 +	break;
- case 71:
+ case 65:
  TAO_YY_RULE_SETUP
- #line 263 "fe/idl.ll"
-@@ -1407,7 +1407,7 @@
+ #line 260 "fe/idl.ll"
+@@ -1348,7 +1348,7 @@
  		  /* ignore comments */
    		  idl_global->set_lineno(idl_global->lineno() + 1);
  		}
 -	TAO_YY_BREAK
 +	break;
- case 72:
+ case 66:
  TAO_YY_RULE_SETUP
- #line 267 "fe/idl.ll"
-@@ -1425,7 +1425,7 @@
+ #line 264 "fe/idl.ll"
+@@ -1366,19 +1366,19 @@
  		    }
  	          }
  	        }
 -	TAO_YY_BREAK
 +	break;
- case 73:
+ case 67:
  TAO_YY_RULE_SETUP
- #line 281 "fe/idl.ll"
-@@ -1437,7 +1437,7 @@
+ #line 278 "fe/idl.ll"
+ ;
+-	TAO_YY_BREAK
++	break;
+ case 68:
+ TAO_YY_RULE_SETUP
+ #line 279 "fe/idl.ll"
  {
    		  idl_global->set_lineno(idl_global->lineno() + 1);
  		}
 -	TAO_YY_BREAK
 +	break;
- case 75:
+ case 69:
+ TAO_YY_RULE_SETUP
+ #line 282 "fe/idl.ll"
+@@ -1388,7 +1388,7 @@
  TAO_YY_RULE_SETUP
- #line 285 "fe/idl.ll"
+ #line 284 "fe/idl.ll"
+ TAO_YY_ECHO;
+-	TAO_YY_BREAK
++	break;
+ case TAO_YY_STATE_EOF(INITIAL):
+ 	tao_yyterminate();
+ 
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index dfda30d9e60..a20b948b43a 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -541,7 +541,7 @@ short tao_yycheck[] = {                                      10,
 #endif
 #define TAO_YYMAXTOKEN 309
 #if TAO_YYDEBUG
-const char *tao_yyname[] = {
+char *tao_yyname[] = {
 "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,"'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'",0,"'/'",0,0,0,0,0,0,0,0,
 0,0,"':'","';'","'<'","'='","'>'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -562,7 +562,7 @@ const char *tao_yyname[] = {
 "IDL_TRUETOK","IDL_FALSETOK","IDL_SCOPE_DELIMITOR","IDL_LEFT_SHIFT",
 "IDL_RIGHT_SHIFT",
 };
-const char *tao_yyrule[] = {
+char *tao_yyrule[] = {
 "$accept : start",
 "start : definitions",
 "definitions : definition definitions",
@@ -959,7 +959,7 @@ int tao_yyindent;
 #endif /* TAO_YYDEBUG_INDENT */
 #ifndef TAO_YYDEBUG_REDUCE
 #ifdef __cplusplus
-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)
+void TAO_YYDEBUG_REDUCE(int tao_yynew_state, int tao_yyrule_num, 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;
@@ -989,7 +989,7 @@ int tao_yyrhs_count;
 #endif /* TAO_YYDEBUG_REDUCE */
 #ifndef TAO_YYDEBUG_SHIFT_LEXEME
 #ifdef __cplusplus
-void TAO_YYDEBUG_SHIFT_LEXEME(int tao_yyold_state, int tao_yynew_state, const char *tao_yytoken_string, int tao_yynew_indent)
+void TAO_YYDEBUG_SHIFT_LEXEME(int tao_yyold_state, int tao_yynew_state, 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;
@@ -1004,7 +1004,7 @@ int tao_yynew_indent;
 #endif /*  TAO_YYDEBUG_SHIFT_LEXEME */
 #ifndef TAO_YYDEBUG_LOOK_AHEAD
 #ifdef __cplusplus
-void TAO_YYDEBUG_LOOK_AHEAD(int tao_yynew_state, 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, 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;
@@ -1049,7 +1049,7 @@ int tao_yyindent;
 #endif /* TAO_YYDEBUG_DISCARD_STATE */
 #ifndef TAO_YYDEBUG_DISCARD_TOKEN
 #ifdef __cplusplus
-void TAO_YYDEBUG_DISCARD_TOKEN(int tao_yynew_state, int tao_yytoken_num, const char *tao_yytoken_string, int tao_yyindent)
+void TAO_YYDEBUG_DISCARD_TOKEN(int tao_yynew_state, int tao_yytoken_num, 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;
@@ -1085,7 +1085,7 @@ tao_yyparse()
 {
     register int tao_yym, tao_yyn, tao_yystate;
 #if TAO_YYDEBUG
-    register const char *tao_yys;
+    register char *tao_yys;
 #ifndef __cplusplus
     extern char *ace_foo();
 #endif
diff --git a/TAO/TAO_IDL/include/be_extern.h b/TAO/TAO_IDL/include/be_extern.h
index c5cecdd86f7..ad43829cf88 100644
--- a/TAO/TAO_IDL/include/be_extern.h
+++ b/TAO/TAO_IDL/include/be_extern.h
@@ -71,12 +71,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Functions:
 
-extern AST_Generator        *BE_init();
+extern "C" AST_Generator        *BE_init();
 
-extern void                 BE_produce();
-extern void                 BE_abort();
-extern void                 BE_prep_arg(char *, idl_bool);
+extern "C" void                 BE_produce();
+extern "C" void                 BE_abort();
+extern "C" void                 BE_prep_arg(char *, idl_bool);
 
-extern void                 BE_version();
+extern "C" void                 BE_version();
 
 #endif           // _BE_EXTERN_BE_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 83ae415fca0..a224ee07160 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -556,6 +556,13 @@ public:
   virtual idl_bool case_diff_error (void);
   // are we strict about case-only differences or not?
 
+  virtual void ami_call_back (idl_bool value);
+  // To enable or disable AMI call back feature of the Messaging
+  // specification in the generated code.
+
+  virtual idl_bool ami_call_back (void);
+  // Return the flag.
+
 private:
   // Data
   UTL_ScopeStack             *pd_scopes;             // Store scopes stack
@@ -696,6 +703,11 @@ private:
   idl_bool case_diff_error_;
   // do we report an error for indentifiers in the same scope that differ
   // only by case? or just a warning?
+
+  idl_bool ami_call_back_;
+  // Flag to indicate whether the AMI Call back feature of the
+  // Messaging specification should be enabled for the generated files
+  // or not.
 };
 
 #endif  //_IDL_IDL_GLOBAL_HH
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index aaeb9dc3b61..566b946f720 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -140,7 +140,8 @@ IDL_GlobalData::IDL_GlobalData (void)
       gen_assign_op_ (I_FALSE),
       exception_support_ (I_FALSE),
       opt_tc_ (I_FALSE),
-      case_diff_error_ (I_TRUE)
+      case_diff_error_ (I_TRUE),
+      ami_call_back_ (I_FALSE)
 {
 
   // Path for the perfect hash generator(gperf) program.
@@ -1387,3 +1388,15 @@ IDL_GlobalData::case_diff_error (void)
 {
   return this->case_diff_error_;
 }
+
+void
+IDL_GlobalData::ami_call_back (idl_bool val)
+{
+  this->ami_call_back_ = val;
+}
+
+idl_bool
+IDL_GlobalData::ami_call_back (void)
+{
+  return this->ami_call_back_;
+}
diff --git a/TAO/VERSION b/TAO/VERSION
index 4b4c6aab25c..a63ca4fa3e5 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 0.3.24, released Tue Jun 08 14:15:52 1999.
+This is TAO version 0.3.23, released Sat May 22 17:10:11 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/Options.html b/TAO/docs/Options.html
index 83f189a0707..094a2d88dfa 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -1,6 +1,5 @@
 <HTML>
 <HEAD>
-  <!-- $Id$ -->
   <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
   <TITLE>Options for TAO Components</TITLE>
 </HEAD>
@@ -105,28 +104,28 @@ while the rest of the options are set via the service configurator
 <TH>Option</TH>
 <TH>Description</TH></TR>
 <!-- <TR NAME="ORBsvcconf"> -->
-<TD><CODE>-ORBSvcConf</CODE> <EM>config file name</EM></TD>
+<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><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><CODE>-ORBdaemon</CODE></TD>
 <TD>Specifies that the ORB should <I>daemonize</I> itself.</TD></TR>
 <TR>
-<TD><CODE>-ORBDebug</CODE></TD>
+<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><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
+<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>
@@ -137,116 +136,93 @@ 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>
+Sets of endpoints may be specified using multiple <CODE>-ORBendpoint</CODE>
 options or by delimiting endpoints with a semi-colon (;).  For example,
 <blockquote><CODE>
--ORBEndpoint iiop://localhost:9999 -ORBEndpoint uiop:///tmp/mylocalsock
+-ORBendpoint iiop://localhost:9999 -ORBendpoint uiop:///tmp/mylocalsock
 </CODE></blockquote>
 is equivalent to:
 <blockquote><CODE>
--ORBEndpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock'
+-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://
+-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
+<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
+<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
+<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
+<CODE>-ORBendpoint</CODE> option. It will not be supported in the
 future.</TD>
 
 </TR>
 
 <TR>
-<TD><CODE>-ORBObjRefStyle</CODE> <EM>which</EM></TD>
+<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.
+<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.
+<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><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><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><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><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><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>-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
+<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
+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
+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
+<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
@@ -257,54 +233,23 @@ copied instead of appended to the CDR stream.</TD></TR>
 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>
+<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
+<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>
+<TD><A name="-ORBInitRef"></a> Allows specification of an arbitrary object reference for an initial service. The IOR could be in the one of the following formats : OMG IOR, URL or iioploc form. iioploc is a multiple end-point IORs 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.</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>
@@ -317,84 +262,80 @@ which is not reentrant.</TD></TR>
 <TH>Option</TH>
 <TH>Description</TH></TR>
 <TR>
-<TD><CODE>-ORBResources</CODE> <EM>which</EM></TD>
+<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>
+(<em>which</em> = <code>tss</code>) instance for the resources it returns.</TD></TR>
 <TR>
-<TD><CODE>-ORBReactorLock</CODE> <EM>which</EM></TD>
-<TD><a name="-ORBReactorLock"></a>Specify whether the ORB reactor is
-              thread-safe
+<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>
+	      <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:
+<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>
+		    <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>
+		    <CODE>ACE_Select_Reactor</CODE> with null locks
+		  </TD></TR>
   <TR><TD><CODE>fl_reactor<CODE></TD><TD>Use the
-                    <CODE>ACE_FlReactor</CODE> only available if ACE
-                    was compiled with support for the FL toolkit
-                  </TD></TR>
+		    <CODE>ACE_FlReactor</CODE> only available if ACE
+		    was compiled with support for the FL toolkit
+		  </TD></TR>
   <TR><TD><CODE>xt_reactor<CODE></TD><TD>Use the
-                    <CODE>ACE_FlReactor</CODE> only available if ACE
-                    was compiled with support for the XWindows Toolkit
-                  </TD></TR>
+		    <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>
+		    <CODE>ACE_WFMO_Reactor</CODE> only available on
+		    Win32 platforms.
+		  </TD></TR>
   <TR><TD><CODE>MsgWFMO<CODE></TD><TD>Use the
-                    <CODE>ACE_Msg_WFMO_Reactor</CODE> only available on
-                    Win32 platforms.
-                  </TD></TR>
+		    <CODE>ACE_Msg_WFMO_Reactor</CODE> only available on
+		    Win32 platforms.
+		  </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
+<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 a global
-              (<em>which</em> = <code>global</code>)
-              or a per-thread (<em>which</em> = <code>tss</code>)
-              allocator for the incoming CDR buffers.
-              Though <CODE>tss</CODE> should give the
-              optimal performance;
-              we made the default <CODE>global</CODE>.
-              TAO optimizations for octet sequences will not work when
-              returning that data type if the allocator is
-              <CODE>tss</CODE>.
-              Using global allocator also allows the users to
-              take advantage of the TAO octet sequence
-              extensions to preserve the buffer after the upcall.
-            </TD></TR>
+<TD><CODE>-ORBinputcdrallocator</CODE> <EM>which</EM></TD>
+<TD><a name="-ORBinputcdrallocator"></a>
+	      Specify whether the ORB uses a global
+	      (<em>which</em> = <code>global</code>)
+	      or a per-thread (<em>which</em> = <code>tss</code>)
+	      allocator for the incoming CDR buffers.
+	      Though <CODE>tss</CODE> should give the
+	      optimal performance;
+	      we made the default <CODE>global</CODE>.
+	      TAO optimizations for octet sequences will not work when
+	      returning that data type if the allocator is
+	      <CODE>tss</CODE>.
+	      Using global allocator 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>
 
 <H3><CODE>TAO_Default_Server_Strategy_Factory</CODE><A NAME="DefaultServer"></A></H3>
 
-<p><em>Note:</em> <code>-ORBDemuxStrategy</code> flag has been changed to <code>-ORBSystemidPolicyDemuxStrategy</code> and <code>-ORBUseridPolicyDemuxStrategy</code>.
-<p><em>Note:</em> <code>-ORBTableSize</code> flag has been changed to <code>-ORBActiveObjectMapSize</code>.
+<p><em>Note:</em> <code>-ORBdemuxstrategy</code> flag has been changed to <code>-ORBsystemidpolicydemuxstrategy</code> and <code>-ORBuseridpolicydemuxstrategy</code>.
+<p><em>Note:</em> <code>-ORBtablesize</code> flag has been changed to <code>-ORBactiveobjectmapsize</code>.
 
 <blockquote>
 <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
@@ -403,38 +344,38 @@ which is not reentrant.</TD></TR>
 <TH>Description</TH></TR>
 <TR>
 
-<TD><CODE>-ORBConcurrency</CODE> <EM>which</EM></TD> <TD>Specify which
+<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
+<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
+<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
+<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
+<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
+<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
@@ -445,27 +386,27 @@ and some memory on the server side can be saved. The
 <CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
 <TR>
 
-<TD><CODE>-ORBActiveHintInIds</CODE> <EM>adds an active hint in
+<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>
+<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
+<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
+<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
+<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
@@ -473,38 +414,38 @@ policy. The <EM>demultiplexing strategy</EM> can be one of
 <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
+<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
+<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><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
+<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
+<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
+<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
@@ -523,7 +464,7 @@ specifies that no locking be performed.  The default is
 <TH>Option</TH>
 <TH>Description</TH></TR>
 <TR>
-<TD><CODE>-ORBIIOPProfileLock</CODE> <EM>which</EM></TD>
+<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
@@ -532,9 +473,9 @@ 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><CODE>-ORBclientconnectionhandler</CODE> <EM>MT / ST / RW</EM></TD>
 
-<TD><A name="-ORBClientConnectionHandler"></a>
+<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
@@ -561,27 +502,6 @@ 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
deleted file mode 100644
index 73fdf8dc2cb..00000000000
--- a/TAO/docs/Tags.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<HTML>
-<HEAD>
-  <!-- $Id$ -->
-  <TITLE>Tags used in TAO</TITLE>
-</HEAD>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#ffffff">
-
-    <HR><P><H3 ALIGN=CENTER>Tags used in TAO</H3></P>
-
-    <H3>Overview</H3>
-
-    <P>The <A HREF="http://www.omg.org/library/c2indx.html">CORBA</A>
-      specification defines several tags, a.k.a. <EM>magic numbers</EM>,
-      to distinguish between several otherwise opaque entities.
-      For example,
-      all profiles are transmitted as a CDR encapsulation (a sequence
-      of octets),
-      using a tag the type of the profile can be determined and the
-      encapsulation can be properly interpreted.
-    </P>
-    <P>To ensure that the tags uniquely indentify the entities in each
-      namespace the <A HREF="http://www.omg.org/">OMG</A> acts as an
-      <EM>allocation authority</EM>,
-      keeps a registry of the tags allocated so far and assigning the
-      new tag values on demand.
-      The process to request a tag is very simple,
-      interested readers can consult
-      <A HREF="http://www.omg.org/cgi-bin/doc?ptc/99-02-01">this
-        link</A>
-      for more details
-    </P>
-
-    <P>We have reserved several tags for TAO, this page documents
-      those tags and how they are used, some details are subject to
-      change.  We recommend that interested readers check the
-      <A HREF="../releasenotes/index.html">release notes</A>
-    </P>
-
-    <H3>List of TAGS</H3>
-
-    <H4>ORB Type ID</H4>
-
-    <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
-      <TR><TH>Hex Value</TH><TH>ASCII Representation</TH>
-        <TH>Description</TH></TR>
-      <TR>
-        <TD>0x54414f00</TD><TD>"TAO\0x00"</TD><TD>IIOP profiles
-          contain a component list. One of the elements of this
-          list (the <CODE>IOP::TAG_ORB_TYPE</CODE>) contains a
-          identifier for the ORB that created the profile.
-        </TD>
-      </TR>
-    </TABLE></P>
-
-    <H4>IOR Profile IDs</H4>
-
-    <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
-      <TR><TH>Hex Value</TH><TH>ASCII Representation</TH>
-        <TH>Description</TH></TR>
-      <TR>
-        <TD>0x54414f00</TD><TD>"TAO\0x00"</TD><TD>A TAO local IPC (aka
-          Unix domain) profiles.
-        </TD>
-      </TR>
-    </TABLE></P>
-
-    <P>The range <CODE>0x54414f01-0x54414f0f</CODE>
-      (<CODE>"TAO\0x01"-"TAO\0x0f"</CODE>) is reserved for future use.
-      Only for informational purposes we include the following list
-      of potential uses:
-    </P>
-
-    <P><TABLE>
-      <TR><TH>Hex Value</TH><TH>ASCII Representation</TH>
-        <TH>Description</TH></TR>
-      <TR>
-        <TD>0x54414f01</TD><TD>"TAO\0x01"</TD>
-        <TD>GIOP over ATM/AAL5</TD>
-      </TR>
-      <TR>
-        <TD>0x54414f02</TD><TD>"TAO\0x02"</TD>
-        <TD>Shared memory transport</TD>
-      </TR>
-      <TR>
-        <TD>0x54414f03</TD><TD>"TAO\0x03"</TD>
-        <TD>Message queue</TD>
-      </TR>
-      <TR>
-        <TD>0x54414f04</TD><TD>"TAO\0x04"</TD>
-        <TD>UDP</TD>
-      </TR>
-      <TR>
-        <TD>0x54414f05</TD><TD>"TAO\0x05"</TD>
-        <TD>IP multicast</TD>
-      </TR>
-      <TR>
-        <TD>0x54414f06</TD><TD>"TAO\0x06"</TD>
-        <TD>Compact PCI bus</TD>
-      </TR>
-      <TR>
-        <TD>0x54414f07</TD><TD>"TAO\0x07"</TD>
-        <TD>VME bus</TD>
-      </TR>
-      <TR>
-        <TD>0x54414f08</TD><TD>"TAO\0x08"</TD>
-        <TD>NT named pipes</TD>
-      </TR>
-      <TR>
-        <TD>0x54414f09</TD><TD>"TAO\0x08"</TD>
-        <TD>HTTP-NG</TD>
-      </TR>
-      <TR>
-        <TD>0x54414f0A</TD><TD>"TAO\0x08"</TD>
-        <TD>Pipes (for collocated calls)</TD>
-      </TR>
-    </TABLE></P>
-
-    <H4>Service Context ID</H4>
-
-    <P>The range <CODE>0x54414f00-0x54414f0f</CODE>
-      (<CODE>"TAO\0x00"-"TAO\0x0f"</CODE>) is reserved for future
-      use.
-    </P>
-
-    <H4>Component IDs</H4>
-
-    <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
-      <TR><TH>Hex Value</TH><TH>ASCII Representation</TH>
-        <TH>Description</TH></TR>
-      <TR>
-        <TD>0x54414f00</TD><TD>"TAO\0x00"</TD>
-        <TD>Server side priority for the endpoint in this profile.
-          The component is encoded a two shorts, the minimum and
-          maximum priorities (in that order).
-          The values correspond to the CORBA priorities defined in the
-          real-time CORBA spec.
-          The client will select the endpoint that matches its
-          priorities and policies.
-        </TD>
-      </TR>
-    </TABLE></P>
-
-    <P>The range <CODE>0x54414f01-0x54414f0f</CODE>
-      (<CODE>"TAO\0x00"-"TAO\0x0f"</CODE>) is reserved for future
-      use.
-    </P>
-
-    <H4>Vendor Minor Code ID (VMCID)</H4>
-
-    <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
-      <TR><TH>Hex Value</TH><TH>ASCII Representation</TH>
-        <TH>Description</TH></TR>
-      <TR>
-        <TD>0x54410000</TD><TD>"TA\x00x00"</TD>
-        <TD>System exceptions thrown by TAO have their higher 20 bits
-          set to <CODE>0x54410</CODE>,
-          the other 12 bits are used to describe more precisely the
-          cause of the exception.
-          The lower 4 bits encode the errno that caused the exception,
-          the 8 intermediate bits encode the location where the
-          exception was raised.
-        </TD>
-      </TR>
-    </TABLE></P>
-
-    <P>The following list describes the current use of errno and
-      location encodings:</P>
-
-
-    <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
-      <TR><TH>Errno Value</TH><TH>Description</TH></TR>
-      <TR>
-        <TD>0x00</TD><TD>The error was not caused by a failed system
-          call</TD>
-      </TR>
-      <TR><TD>0x01</TD><TD>ETIMEDTOUT</TD></TR>
-      <TR><TD>0x02</TD><TD>ENFILE</TD></TR>
-      <TR><TD>0x03</TD><TD>EMFILE</TD></TR>
-      <TR><TD>0x04</TD><TD>EPIPE</TD></TR>
-      <TR><TD>0x05</TD><TD>ECONNREFUSED</TD></TR>
-      <TR><TD>0x06</TD><TD>ENOENT</TD></TR>
-      <TR><TD>0x07</TD><TD>EBADF</TD></TR>
-      <TR><TD>0x08</TD><TD>ENOSYS</TD></TR>
-      <TR><TD>0x09</TD><TD>EPERM</TD></TR>
-      <TR><TD>0x0A</TD><TD>EAFNOSUPPORT</TD></TR>
-    </TABLE></P>
-
-    <P>Please consult the documentation for your OS for more details
-      about the errno meanings</P>
-
-    <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
-      <TR><TH>Location encoding</TH><TH>Description</TH></TR>
-      <TR><TD>0x00</TD>
-        <TD>Connect failed</TD></TR>
-      <TR><TD>0x01</TD>
-        <TD>Location forward failed</TD></TR>
-      <TR><TD>0x02</TD>
-        <TD>Send request failed</TD></TR>
-      <TR><TD>0x03</TD>
-        <TD>POA in discarding state</TD></TR>
-      <TR><TD>0x04</TD>
-        <TD>POA in holding state</TD></TR>
-      <TR><TD>0x05</TD>
-        <TD>Unhandled C++ exception in server side</TD></TR>
-      <TR><TD>0x06</TD>
-        <TD>Failure while reading the reply</TD></TR>
-    </TABLE></P>
-
-    <P><HR></P>
-
-    Back to the TAO <A HREF="index.html">documentation</A>.
-
-    <!--#include virtual="/~schmidt/cgi-sig.html" -->
-  </BODY>
-</HTML>
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 457bf7fb445..58fcfde4642 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -12,86 +12,56 @@
 <h3>
 TAO IDL compiler User's Guide</h3>
 
-<h2> Scope</h2> This document describes the options and features of
-TAO IDL compiler.  It is not a reference manual or tutorial on OMG
-IDL.  For more information on OMG IDL see the <A
-HREF="http://www.omg.org/library/c2indx.html">online CORBA
-specification</A> and the <A
-HREF="http://www.triodia.com/staff/michi-henning.html">Advanced CORBA
-Programming with C++</A> book. <P>
-
-<HR><P>
-<h3>Generated Files</h3>
-
-The IDL compiler generates 9 files from each <tt>.idl</tt> file.  The
-file names are obtained by taking the IDL <EM>basename</EM> and
-appending the following suffixes (see the list of TAO's IDL compiler
-<A HREF="#options">options</A> on how to get different suffixes for
-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>
-</UL>
-
-TAO's IDL compiler creates separate <TT>*.i</TT> and <TT>*S_T.*</TT>
-files to improve the performance of the generated code.  Fortunately,
-you only need to <CODE>#include</CODE> the client stubs declared in
-the <tt>*C.h</tt> file and the skeletons in the <tt>*S.h</tt> file in
-your code. <P>
-
-<HR><P>
-<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
-IDL compiler supports perfect hashing, binary search, and dynamic
-hashing demuxing strategies.  By default, TAO's IDL compiler tries to
-generate perfect hash functions, which is generally the most <A
-HREF="http://www.cs.wustl.edu/~schmidt/COOTS-99.ps.gz">efficient and
-predictable operation demuxing technique</A>.  To generate perfect
-hash functions, TAO's IDL compiler uses <a
-href="http://www.cs.wustl.edu/~schmidt/gperf.ps.gz">gperf </a>, which
-is a general-purpose perfect hash function generator. <P>
-
-To configure TAO's IDL compiler to support perfect hashing please do
-the following:
-
+<h2>
+Scope</h2>
+This document describes the options and features of TAO IDL compiler, it
+is not a reference manual or tutorial on IDL.
+<h2>
+Generated Files</h2>
+The IDL compiler generates 6 files from each <tt>.idl</tt> file, the file
+names are obtained by taking the IDL basename and appending <tt>C.h</tt>,
+<tt>C.i</tt>,
+<tt>C.cpp</tt>,
+<tt>S.h</tt>,
+<tt>S.i</tt>
+and <tt>S.cpp</tt>; the client stubs are declared in the <tt>C.h</tt> file,
+the skeletons in the <tt>S.h</tt> file. Please see the Options list on
+how to get different suffixes for these files.
+<p>Both clients and servers should link against the object files for the
+stubs and skeletons, this is needed to transparently support collocated
+objects.
+<h2>
+Operation Lookup Strategies</h2>
+The server skeleton can make use of different lookup strategies to match
+the incoming operation with the correct operation at the servant.
+<br>Dynamic Hashing and Perfect Hashing are the two different operation
+lookup strategies that are currently supported in tao_idl.
+<br>By default, tao_idl tries to use Perfect Hashing strategy. <a href="http://www.cs.wustl.edu/~schmidt/gperf.ps.gz">gperf
+</a>generates
+the lookup methods for this strategy.
+<br>ACE_HAS_GPERF has been defined for the platforms where gperf works.
+This includes Solaris and NT.
+<p>To make use of Perfect Hashing:
 <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.
-</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>
+<li>
+Build the gperf program at $ACE_ROOT/apps/gperf. (This build also leaves
+a copy/link of the gperf program at the $ACE_ROOT/bin directory).</li>
 
-<HR><P>
-<h3><A NAME="options">TAO's IDL Compiler Options</A></h3>
+<li>
+Set the environment variable $ACE_ROOT appropriately or add $ACE_ROOT/bin
+to the PATH.</li>
 
-TAO's IDL compiler invokes your <tt>C</tt> (or <tt>C++</tt>)
-preprocessor to resolve included IDL files.  It receives the common
-options for preprocessors (such as <tt>-D</tt> or <tt>-I</tt>).  It
-also receives other options that are specific to it. <P>
+<li>
+Use -g option for the tao_idl or set the PATH accordingly to use gperf
+located at other places other than $ACE_ROOT/bin.</li>
+</ul>
 
+<h2>
+Options</h2>
+The IDL compiler invokes your <tt>C</tt> (or <tt>C++</tt>) preprocessor
+to resolve included IDL files, it receives the common options for preprocessors
+(such as <tt>-D</tt> or <tt>-I</tt>); but also receives other options that
+are specific to it.
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 >
 <tr>
 <th>Option</th>
@@ -178,31 +148,31 @@ macro.&nbsp;</td>
 <td><tt>-H perfect_hash</tt></td>
 
 <td>To specify the IDL compiler to generate skelton code that uses perfect
-hashed operation demuxing strategy, which is the default strategy. Perfect
+hashed operation lookup 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>
+to generate lookup methods.&nbsp;</td>
 </tr>
 
 <tr NAME="H dynamic_hash">
 <td><tt>-H dynamic_hash</tt></td>
 
 <td>To specify the IDL compiler to generate skelton code that uses dynamic
-hashed operation demuxing strategy.&nbsp;</td>
+hashed operation lookup strategy.&nbsp;</td>
 </tr>
 
 <tr NAME="H binary_search">
 <td><tt>-H binary_search</tt></td>
 
 <td>To specify the IDL compiler to generate skelton code that uses binary
-search based operation demuxing strategy.&nbsp;</td>
+search based operation lookup strategy.&nbsp;</td>
 </tr>
 
 <tr NAME="H linear_search">
 <td><tt>-H linear_search</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>
+search based operation lookup strategy.</td>
 </tr>
 
 
@@ -333,7 +303,7 @@ for now)&nbsp;</td>
 <tr NAME="Ge">
 <td><tt>-Ge</tt></td>
 
-<td>Generate code that uses C++ exceptions</td>
+<td>Generate code that uses C++ exceptions (unimplemented as yet)</td>
 </tr>
 
 <tr NAME="Gt">
@@ -395,12 +365,11 @@ for now)&nbsp;</td>
 
 <td>Suppress generation of the TypeCodes</td>
 </tr>
-</table> <P>
-
-<P><HR><P>
-Back to the TAO <A HREF="index.html">documentation</A>.
+</table>
 
-<!--#include virtual="/~schmidt/cgi-sig.html" -->
+<hr>
+<address>
+<i><a href="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</a></i></address>
 
 </body>
 </html>
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
index 739f2556d16..ded8b72b715 100644
--- a/TAO/docs/index.html
+++ b/TAO/docs/index.html
@@ -1,7 +1,6 @@
 <html>
 
 <head>
-  <!-- $Id$ -->
 <meta NAME="GENERATOR" CONTENT="Microsoft FrontPage 3.0">
 <title>TAO Documentation</title>
 </head>
@@ -20,9 +19,9 @@
         Overview</a> </dt><P>
       <dt><a HREF="http://www.omg.org/library/c2indx.html">OMG CORBA 2.x spec</a> </dt><P>
       <dt><p><a href="../../docs/exceptions.html">Exception Handling</a></p>
-      <dt><a HREF="http://www.cs.wustl.edu/~schmidt/TAO/index.html">TAO Tutorials</a></dt><P>
+      <dt><a HREF="http://www.cs.wustl.edu/~schmidt/events_tutorial.html">Event Service Tutorial</a></dt><P>
+      <dt><a HREF="http://www.cs.wustl.edu/~schmidt/TAO/index.html">TAO Viewgraphs</a></dt><P>
       <dt><a HREF="releasenotes/index.html">Release Notes</a> </dt><P>
-      <dt><a HREF="Tags.html">Tags and Magic Numbers</a> </dt><P>
     </dl>
     </td></font>
 
diff --git a/TAO/docs/minimumTAO.html b/TAO/docs/minimumTAO.html
index c6b53d8e193..3db1cd0779c 100644
--- a/TAO/docs/minimumTAO.html
+++ b/TAO/docs/minimumTAO.html
@@ -33,14 +33,12 @@ specification.
 <p>
 
 To minimize the footprint of TAO, we first <a href =
-"http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">
-configure </a> ACE to support only those <a href =
-"http://www.cs.wustl.edu/~schmidt/ACE_wrappers/docs/ACE-subsets.html">
-components </a> that are required by TAO. Secondly, we <a href =
-"http://www.cs.wustl.edu/~schmidt/TAO/TAO-INSTALL.html"> configure
-</a> TAO to only support the components specified by the <em>
-minimumCORBA </em> specification.  The following two tables show the
-footprint reduction achieved.  Note that the IDL Compiler column
+"../../ACE-INSTALL.html"> configure </a> ACE to support only those <a
+href = "../../docs/ACE-subsets.html"> components </a> that are
+required by TAO. Secondly, we <a href = "../TAO-INSTALL.html">
+configure </a> TAO to only support the components specified by the
+<em> minimumCORBA </em> specification.  The following two tables show
+the footprint reduction achieved.  Note that the IDL Compiler column
 refers to the code required to collaborate between the IDL compiler
 and the ORB, and not to the code for the IDL compiler itself.
 
diff --git a/TAO/docs/poa_migration.html b/TAO/docs/poa_migration.html
index bcb446b1d4d..9c925e511f2 100644
--- a/TAO/docs/poa_migration.html
+++ b/TAO/docs/poa_migration.html
@@ -2,7 +2,6 @@
 <HEAD>
   <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
   <TITLE>Migrating from the BOA to the POA</TITLE>
-  <!-- $Id$ -->
 </HEAD>
 
 <BODY text = "#000000"
@@ -35,7 +34,9 @@ HREF="http://www.iona.com/hyplan/vinoski/">Steve Vinoski</a>.
 <H4><a name="Client-side Changes">Client-side Changes</a></h4>
 
 <ul>
-<li>Very little has changed.  Thus, many applications require no changes.</li><P>
+<li>Very little has changed.  Thus, many applications require to changes.</li><P>
+<li>You'll have to insure that the Makefile includes .o's for both the server
+and client, which is necessary in TAO to support collocation.</li> <P>
 </ul>
 
 <h4><a name="Server-side Changes">Server-side Changes</a></h4>
diff --git a/TAO/docs/releasenotes/TODO.html b/TAO/docs/releasenotes/TODO.html
index 52c665052f0..f74be91a90c 100644
--- a/TAO/docs/releasenotes/TODO.html
+++ b/TAO/docs/releasenotes/TODO.html
@@ -211,7 +211,8 @@
 	</P>
       </LI>
 
-      <LI><P>Use GIOP 1.1 fragments to minimize the buffer allocations:
+      <LI><P>One GIOP 1.1 is implemented we could use fragments to
+	  minimize the buffer allocations:
 	  the buffer could be fixed size and we simply send fragments
 	  for each buffer.
 	</P>
@@ -250,11 +251,6 @@
 	</P>
       </LI>
 
-	<LI><P>A new spec for Dynamic Any has been published and will
-	  probably be part of CORBA 2.4. There are a great many
-	  changes, leaving almost no area of the current implementation
-	  untouched.
-
     </OL>
 
     <H4>New features and Bug fixes</H4>
@@ -349,14 +345,135 @@
 	</P>
       </LI>
 
-      <LI><P><B>ORB: </B> Stress test the ORB in the presence of
-	  exceptions, verifying that no resources are leaked, all
-	  locks are released, etc.
-	</P>
-	<P>Note: small experiments indicate that everything is OK, and 
-	  several tests raise exceptions without problems, but we need 
-	  an intensive test of this features.
-	</P>
+      <LI><P>Support native C++ exceptions.
+	This entails the following subtasks:<P>
+	<OL>
+	  <LI>Create exceptions with the right dynamic type on the
+	      client side.
+	    For SII this should be simple:
+	      the stub give us a list of the
+	      possible user exceptions together with the factory methods
+	      to allocate an exception of each type;
+	      if the exception is not on that list we throw a
+	      <CODE>CORBA::UNKNOWN</CODE>.
+	      For DII we have to throw a
+	      <CODE>CORBA::UnknownUserException</CODE>;
+	      the user will receive the real exception inside an
+	      <CODE>Any</CODE> then and she will have to extract it
+	      either using the &gt&gt= operator or using the
+	      forthcoming <CODE>DynAny</CODE>.
+	    System exceptions are even easier, we always know how
+	      to create them.
+	    <BR>[STATUS] SII is working OK, we still need to complete
+	    the support for DII.
+	    <BR>[STATUS] The DII support was completed, but remains
+	    untested.
+	  <P></LI>
+
+	  <LI>Add the _raise() method to the exceptions.
+	    <BR>[DONE]
+	  <P></LI>
+
+	  <LI>On the server side: catch any CORBA exceptions thrown by
+	    the upcall, and then transform that into the
+	    proper <CODE>Reply</CODE> to the client side.
+	    In the case of another C++ exception should we do
+	    something?
+	    <BR>[DONE]
+	  <P></LI>
+
+	  <LI>On the client side, after creating the exception with
+	    the right dynamic type we must invoke
+	    <CODE>_raise()</CODE> on it.
+	    <BR>[DONE]
+	  <P></LI>
+
+	  <LI>Provide a TSS default value for the CORBA_Environment,
+	    all the methods in the ORB library should use this
+	    default.
+	    <BR>[DONE]
+	  <P></LI>
+
+	  <LI><B>IDL Compiler:</B> The IDL compiler should be able to
+            generate the 
+	    alternative mapping, but with the TSS default for the env
+	    argument.
+	    <BR>[DONE]
+	  <P></LI>
+
+	  <LI><B>IDL Compiler:</B> The IDL compiler should generate the
+            standard mapping, without the environment argument.
+	  <P></LI>
+	  
+	  <LI><P>In general we will need to complete and debug the
+	      <CODE>TAO_TRY</CODE> macros;
+	      they have limitations when dealing with the
+	      alternative mapping, but are very useful.
+	      <BR>[STATUS] This seems to be OK now, the code seems to
+	      compile and work correctly now.
+	      <BR>[STATUS] We need a new macro (TAO_TRY_THROW) to use
+	      inside the TAO_TRY blocks, because TAO_THROW will not go
+	      into the TAO_CATCH blocks, even if the exceptions match.
+	      <BR>[STATUS] Nanbor implemented a much better set of
+	      macros, that can be used with other ORBs, it is
+	      implemented in <CODE>$ACE_ROOT/ace/CORBA_macros.h</CODE>
+	    </P>
+	  </LI>
+
+	  <LI>We need to test the ORB for resource leaking in the
+	    presence of exceptions.
+	  <P></LI>
+
+	  <LI>We <EM>could</EM> write portable server side code with
+	    any of the mappings above if we use a macro for the env
+	    argument, but the results are ugly:
+	    <PRE>
+// IDL
+interface Foo {
+  void bar (in long x);
+};
+
+// C++ 
+class Foo {
+  void bar (CORBA::Long x TAO_ENV_ARG)
+               TAO_THROW_SPEC ((CORBA::SystemException));
+};
+	    </PRE>
+	    note the missing comma before the TAO_ENV_ARG parameter.
+            <P>
+            </P> A different alternative is to generate both
+            functions, and make the default implementation just invoke
+            the other:
+	    <PRE>
+// IDL
+interface Foo {
+  void bar (in long x);
+};
+
+// C++ 
+class POA_Foo {
+  void bar (CORBA::Long x, CORBA::Environment& env)
+               TAO_THROW_SPEC ((CORBA::SystemException))
+  {
+    this->bar (x);
+  }
+  void bar (CORBA::Long x)
+               TAO_THROW_SPEC ((CORBA::SystemException)) = 0;
+};
+	    </PRE>
+            The problem is: which alternative should be the pure
+            virtual function? Which one is overriden by the user?
+	  <P></LI>
+
+	</OL>
+	<BR>[STATUS] The main task ahead is to generate the conforming
+	mapping for the server side, i.e. remove the
+	<CODE>CORBA::Environment</CODE> argument and generate the
+	throw specs.
+	We need to wait for the compiled marshaling support to
+	implement this feature, otherwise the number of conflicts,
+	visitors and factories will grow without limit.
+      </P>
       </LI>
 
       <LI><P><B>EC:</B> Automate EC multicast group usage. This probably
@@ -393,13 +510,18 @@
 	</P>
       </LI>
 
-      <LI><P><B>ORB: </B> Use the IIOP 1.1 profile info to pass QoS
-	  info and use it to preserve end-to-end QoS.
-	  <BR>[STATUS] The tagged component for encoding QoS
-	  information was created, but the server does not create it,
-	  neither does the client use that information.
-	</P>
-      </LI>
+      <LI>Support GIOP 1.1 in the ORB (fragments)
+      <P></LI>
+
+      <LI>Support IIOP 1.1 in the ORB
+      <P></LI>
+
+      <LI>Use the IIOP 1.1 profile info to pass QoS info and use it to
+	preserve end-to-end QoS.
+      <P></LI>
+
+      <LI>Support IIOP 1.2 in the ORB
+      <P></LI>
 
       <LI>The size of pre-allocated buffer for the outgoing CDR
 	streams is defined at compilation time; but if we use an
@@ -411,11 +533,23 @@
 	number of calls to ORB_Core_instance()
       <P></LI>
  
+      <LI><B>IDL Compiler:</B> The IDL compiler front-end should be
+        case insensitive,
+	more precisely it should flag identifiers that only differ by
+        case as a conflict and verify that all uses of an identifier
+        have the same case.
+      <P></LI>
+
       <LI><B>IDL Compiler:</B> The operation tables do not need to be
         statics, they could be created on creation of the first
         servant of that type. 
       <P></LI>
       
+      <LI><B>IDL Compiler:</B>Support for unions with default cases
+        (implicit or explicit)
+	in the IDL compiler is incomplete.
+      <P></LI>
+
       <LI><P>It seems that some memory is leaked from the ORB cached
 	  connector; but Purify gets confused by the fact that TAO
 	  dynamically loads libTAO, so it could be just a bogus report.
@@ -426,12 +560,9 @@
         type in the IDL compiler 
       <P></LI>
 
-      <LI><P>CDR stream support for <CODE>wchar</CODE> is flaky or at
-	  least untested.
-	  <BR>[STATUS] This is slowly beign implemented, and so are
-	  codeset translators inside the CDR streams.
-	</P>
-      </LI>
+      <LI>CDR stream support for <CODE>wchar</CODE> is flaky or at
+        least untested.
+      <P></LI>
 
       <LI>Add &lt&lt and &gt&gt operators to the
 	<CODE>CORBA::Request</CODE> class, to simplify DII invocations
@@ -447,6 +578,26 @@
       </LI>
       
       <LI><P><B>ORB:</B>
+	  Support multiple calls to ORB_init().
+	  This requires several changes:
+	<UL>
+	  <LI>Object references must keep an explicit reference to the
+	    ORB that created them. In turn this requires that CDR
+	    streams carry the ORB pointer for object reference
+	    decoding.
+	  </LI>
+	  <LI>We must keep a table of ORB pointers based on the
+	    <CODE>-ORBid</CODE> option.
+	  </LI>
+	  <LI>The hint on the cached connector has to be revised if
+	    support for zero locks in the cached connector is going to 
+	    work.
+	  </LI>
+	</UL>
+        </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
@@ -470,10 +621,22 @@
 	startup/shutdown.
       <P></LI>
 
+      <LI><B>EC:</B> Debug interval computation in Linux (and NT?)
+      <P></LI>
+
       <LI><B>IDL Compiler:</B> The IDL compiler could generate a static
         method to access the interface repository ID of a class.
       <P></LI>
 
+      <LI><B>IDL Compiler:</B> The IDL compiler should support
+	<CODE>#include "orb.idl"</CODE> properly.
+	IMHO it should not
+	add any <CODE>#include</CODE> to the generated code and the
+	<CODE>orb.idl</CODE> file should contain all the declarations,
+	except for the pseudo objects that are should be hardcoded
+	into the compiler.
+      <P></LI>
+
       <LI>The current scheme for the orbsvcs leaves the user without
 	control over collocation of servants, we need to move to a scheme
 	similar to the one in $ACE_ROOT/netsvcs.
@@ -510,6 +673,11 @@
 	</UL>
       <P></LI>
 
+      <LI><P><B>IDL Compiler:</B> The methods on the server side
+          <B>must</B> have a throw spec, check CORBA 2.2, 20.35
+        </P>
+      </LI>
+
       <LI><P>According to Vinoski and Henning the
 	  <CODE>CORBA::Policy</CODE> objects are also locality
 	  constrained.
@@ -566,6 +734,14 @@
 	</P>
       </LI>
 
+      <LI><P><B>POA:</B> The <CODE>SINGLE_THREAD_MODEL</CODE> for the
+	  POA requires that at most one concurrent call is invoked on
+	  each servant in that POA.
+	  <BR>[STATUS] Irfan is working on it as part of the POA
+	  concurrency fixes.
+	</P>
+      </LI>
+
       <LI><P><CODE>$TAO_ROOT/orbsvcs/tests</CODE> may require the same
 	  hierarchy changes that were done in
 	  <CODE>$TAO_ROOT/tests</CODE>.
@@ -579,6 +755,17 @@
       </LI>
 
       <LI><P><B>ORB:</B>
+	  The implementation for the leader-follower
+	  model on the client side has bug:
+	  it will add the current thread to the follower list every
+	  time it returns from waiting in the condition variable,
+	  assuming that it was signaled and removed every time.
+	  <BR>[STATUS] This is not a big problem because only a
+	  warning is printed out.
+	</P>
+      </LI>
+
+      <LI><P><B>ORB:</B>
 	  By default TAO disables Nagle's algorithm, this should be
 	  an optional feature, otherwise TAO will perform poorly over
 	  WANs.
@@ -666,6 +853,12 @@
         </P>
       </LI>
 
+      <LI><P>We need support for the timeout policies specified in
+	  CORBAmessaging. The timeouts can control connection and
+	  total request time.
+        </P>
+      </LI>
+
       <LI><P><B>ORB:</B>
 	  Decouple the ORB from interpretive marshaling. This style of 
 	  marshaling will not be required for many applications, and
@@ -692,21 +885,27 @@
 	    It may be possible to agressively reduce the footprint by
 	    removing both <CODE>skip</CODE> and <CODE>Any</CODE>.
 	  </LI>
-	  <LI>Exceptions are marshaled using the interpretive engine,
-	    there is no reason why the skeletons couldn't do that job.
-	  </LI>
 	</UL>
 	</P>
       </LI>
 
-    <HR></HR>
+      <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 
+	  use the <CODE>T::_var_type</CODE> trait.
+	  We also have to change the class generated by the IDL
+	  compiler.
+	  Similar changes maybe required for the
+	  <CODE>TAO_String_Manager</CODE> and the
+	  <CODE>TAO_Object_Field</CODE> classes.
+	</P>
+      </LI>
+
+    <HR>
 
   <!-- Things below this point are "big" tasks" that -->
   <!-- could require major work -->
 
-    <LI><P><B>ORB: </B>Support IIOP 1.2 in the ORB</P>
-    </LI>
-
       <LI><P>Provide mechanisms to marshal arguments into a CDR
           stream, Jon Biggar contributed his proposal to the CORBA 2.3
           RTF:
@@ -911,249 +1110,8 @@ encapsulation format.
 <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 
-	  use the <CODE>T::_var_type</CODE> trait.
-	  We also have to change the class generated by the IDL
-	  compiler.
-	  Similar changes maybe required for the
-	  <CODE>TAO_String_Manager</CODE> and the
-	  <CODE>TAO_Object_Field</CODE> classes.
-	  <BR>[DONE] Bala implemented this feature.
-	</P>
-      </LI>
-
-      <LI><P><B>ORB:</B>
-	  The implementation for the leader-follower
-	  model on the client side has bug:
-	  it will add the current thread to the follower list every
-	  time it returns from waiting in the condition variable,
-	  assuming that it was signaled and removed every time.
-	  <BR>[STATUS] This is not a big problem because only a
-	  warning is printed out.
-	  <BR>[DONE]
-	</P>
-      </LI>
-
-      <LI><P><B>POA:</B> The <CODE>SINGLE_THREAD_MODEL</CODE> for the
-	  POA requires that at most one concurrent call is invoked on
-	  each servant in that POA.
-	  <BR>[STATUS] Irfan is working on it as part of the POA
-	  concurrency fixes.
-	  <BR>[DONE]
-	</P>
-      </LI>
-
-      <LI><P><B>IDL Compiler:</B> The methods on the server side
-          <B>must</B> have a throw spec, check CORBA 2.2, 20.35
-	  <BR>[DONE] Andy implemented this as part of the support for
-	  native C++ exceptions.
-        </P>
-      </LI>
-
-      <LI><P><B>IDL Compiler:</B> The IDL compiler should support
-	  <CODE>#include "orb.idl"</CODE> properly.
-	  IMHO it should not
-	  add any <CODE>#include</CODE> to the generated code and the
-	  <CODE>orb.idl</CODE> file should contain all the declarations,
-	  except for the pseudo objects that are should be hardcoded
-	  into the compiler.
-	  <BR>[DONE] Jeff (and others?) implemented this feature, the
-	  contents of the &lt;orb.idl&gt; file may need some work, but that
-	  is easy to fix.
-	</P>
-      </LI>
-
-      <LI><P><B>EC:</B> Debug interval computation in Linux (and NT?)
-	  <BR>[DONE] There was a problem with the ACE_High_Res_Timer
-	  initialization.
-	</P>
-      </LI>
-
-      <LI><P><B>ORB:</B>
-	  Support multiple calls to ORB_init().
-	  This requires several changes:
-	<UL>
-	  <LI>Object references must keep an explicit reference to the
-	    ORB that created them. In turn this requires that CDR
-	    streams carry the ORB pointer for object reference
-	    decoding.
-	    <BR>[DONE]
-	  </LI>
-	  <LI>We must keep a table of ORB pointers based on the
-	    <CODE>-ORBid</CODE> option.
-	    <BR>[DONE]
-	  </LI>
-	  <LI>The hint on the cached connector has to be revised if
-	    support for zero locks in the cached connector is going to 
-	    work.
-	    <BR>[POSTPONED] The new cached connector implementation
-	    will change this anyway.
-	  </LI>
-	</UL>
-        </P>
-      </LI>
-
-      <LI><P><B>IDL Compiler:</B>Support for unions with default cases 
-	  (implicit or explicit)
-	  in the IDL compiler is incomplete.
-	  <BR>[DONE] Andy implemented this features.
-	</P>
-      </LI>
-
-      <LI><P><B>IDL Compiler:</B> The IDL compiler front-end should be
-	  case insensitive,
-	  more precisely it should flag identifiers that only differ by
-	  case as a conflict and verify that all uses of an identifier
-	  have the same case.
-	  <BR>[DONE] Jeff implemented this feature, there is an option 
-	  to disable it for backwards compatibility.
-	</P>
-      </LI>
-
-      <LI><P>Support GIOP 1.1 in the ORB (fragments)
-	  <BR>[DONE] The ORB should be able to receive GIOP 
-	</P>
-      <P></LI>
-
-      <LI>Support IIOP 1.1 in the ORB
-      <P></LI>
-
-      <LI><P>Support native C++ exceptions.
-	This entails the following subtasks:<P>
-	<OL>
-	  <LI>Create exceptions with the right dynamic type on the
-	      client side.
-	    For SII this should be simple:
-	      the stub give us a list of the
-	      possible user exceptions together with the factory methods
-	      to allocate an exception of each type;
-	      if the exception is not on that list we throw a
-	      <CODE>CORBA::UNKNOWN</CODE>.
-	      For DII we have to throw a
-	      <CODE>CORBA::UnknownUserException</CODE>;
-	      the user will receive the real exception inside an
-	      <CODE>Any</CODE> then and she will have to extract it
-	      either using the &gt&gt= operator or using the
-	      forthcoming <CODE>DynAny</CODE>.
-	    System exceptions are even easier, we always know how
-	      to create them.
-	    <BR>[STATUS] SII is working OK, we still need to complete
-	    the support for DII.
-	    <BR>[STATUS] The DII support was completed, but remains
-	    untested.
-	  <P></LI>
-
-	  <LI>Add the _raise() method to the exceptions.
-	    <BR>[DONE]
-	  <P></LI>
-
-	  <LI>On the server side: catch any CORBA exceptions thrown by
-	    the upcall, and then transform that into the
-	    proper <CODE>Reply</CODE> to the client side.
-	    In the case of another C++ exception should we do
-	    something?
-	    <BR>[DONE]
-	  <P></LI>
-
-	  <LI>On the client side, after creating the exception with
-	    the right dynamic type we must invoke
-	    <CODE>_raise()</CODE> on it.
-	    <BR>[DONE]
-	  <P></LI>
-
-	  <LI>Provide a TSS default value for the CORBA_Environment,
-	    all the methods in the ORB library should use this
-	    default.
-	    <BR>[DONE]
-	  <P></LI>
-
-	  <LI><B>IDL Compiler:</B> The IDL compiler should be able to
-            generate the 
-	    alternative mapping, but with the TSS default for the env
-	    argument.
-	    <BR>[DONE]
-	  <P></LI>
-
-	  <LI><B>IDL Compiler:</B> The IDL compiler should generate the
-            standard mapping, without the environment argument.
-	    <BR>[DONE]
-	  <P></LI>
-	  
-	  <LI><P>In general we will need to complete and debug the
-	      <CODE>TAO_TRY</CODE> macros;
-	      they have limitations when dealing with the
-	      alternative mapping, but are very useful.
-	      <BR>[STATUS] This seems to be OK now, the code seems to
-	      compile and work correctly now.
-	      <BR>[STATUS] We need a new macro (TAO_TRY_THROW) to use
-	      inside the TAO_TRY blocks, because TAO_THROW will not go
-	      into the TAO_CATCH blocks, even if the exceptions match.
-	      <BR>[STATUS] Nanbor implemented a much better set of
-	      macros, that can be used with other ORBs, it is
-	      implemented in <CODE>$ACE_ROOT/ace/CORBA_macros.h</CODE>
-	    </P>
-	  </LI>
-
-	  <LI>We need to test the ORB for resource leaking in the
-	    presence of exceptions.
-	  <P></LI>
-
-	  <LI>We <EM>could</EM> write portable server side code with
-	    any of the mappings above if we use a macro for the env
-	    argument, but the results are ugly:
-	    <PRE>
-// IDL
-interface Foo {
-  void bar (in long x);
-};
-
-// C++ 
-class Foo {
-  void bar (CORBA::Long x TAO_ENV_ARG)
-               TAO_THROW_SPEC ((CORBA::SystemException));
-};
-	    </PRE>
-	    note the missing comma before the TAO_ENV_ARG parameter.
-            <P>
-            </P> A different alternative is to generate both
-            functions, and make the default implementation just invoke
-            the other:
-	    <PRE>
-// IDL
-interface Foo {
-  void bar (in long x);
-};
-
-// C++ 
-class POA_Foo {
-  void bar (CORBA::Long x, CORBA::Environment& env)
-               TAO_THROW_SPEC ((CORBA::SystemException))
-  {
-    this->bar (x);
-  }
-  void bar (CORBA::Long x)
-               TAO_THROW_SPEC ((CORBA::SystemException)) = 0;
-};
-	    </PRE>
-            The problem is: which alternative should be the pure
-            virtual function? Which one is overriden by the user?
-	  <P></LI>
-
-	</OL>
-	<BR>[STATUS] The main task ahead is to generate the conforming
-	mapping for the server side, i.e. remove the
-	<CODE>CORBA::Environment</CODE> argument and generate the
-	throw specs.
-	We need to wait for the compiled marshaling support to
-	implement this feature, otherwise the number of conflicts,
-	visitors and factories will grow without limit.
-      </P>
-      </LI>
-
-     <LI><P><B>EC:</B>The new implementation of the EC does not send
+    <OL>
+      <LI><P><B>EC:</B>The new implementation of the EC does not send
 	  <CODE>disconnect</CODE> messages on shutdown, this has to be 
 	  implemented.
 	  <BR>[DONE]
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index b288c3f96f4..3dd8e18c23d 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -97,26 +97,13 @@ A complete list of all modifications to TAO is available in the <a href="http://
 <a NAME="idl"></a>IDL Compiler</h3>
 Point of contact: <a href="mailto:gokhale@research.bell-labs.com">Aniruddha
 Gokhale</a>
-<p>Current status: (As of June 12, 1999.)
+<p>Current status: (As of May 15, 1999.)
 <ul>
 <li>
 Generated code closely follows the C++ Mapping specified in the latest
 C++ mapping for CORBA 2.3 (Document ptc/98-09-03).</li>
 
 <li>
-IDL compiler is now able to generate code that support native C++
-exceptions on the stubs and skeletons. With this strict mapping, the
-CORBA::Environment parameter is no longer generated. Use the -Ge flag
-to get this functionality.
-</li>
-
-<li>
-We are now able to handle shared case labels and default label in
-unions. In addition, whenever appropriate, we are also able to
-generate the "default ()" operation.
-</li>
-
-<li>
 We are now able to handle recursive types. We are also able to
 generate optimized typecodes.
 </li>
@@ -280,6 +267,12 @@ Generation of Managed types must somehow be moved to the ORB Core</li>
 We need support for ``TIEs'' (i.e., the object form of the Adapter pattern).</li>
 
 <li>
+TypeCode generation for recursive types not implemented yet.</li>
+
+<li>
+Unions with default cases yet to be handled</li>
+
+<li>
 IDL is case-insensitive. However, it looks like our front-end is case-sensitive.
 Thanks to Anil Gopinath (anil@ittc.ukans.edu) for pointing this out.</li>
 </ul>
diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html
index adc0794d2a0..fc3c839542b 100644
--- a/TAO/docs/releasenotes/orbcore.html
+++ b/TAO/docs/releasenotes/orbcore.html
@@ -32,15 +32,8 @@ Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
 
 <ul>
   <li><p>Trying to figure out a better <em>resource</em> management
-	  scheme.  <em>Resouces</em> here include ORB, POA, connections,
-	  profiles.... that provide services for CORBA invocations.
-	</p>
-	<P>[STATUS]: The current version keeps very few objects
-	  managed by the resource factory. Most are ORB specific. It
-	  seems like the correct implementation is to make the few
-	  remaining resources (such as the Reactor) a
-	  per-ORB-per-thread entity.
-	</P>
+      scheme.  <em>Resouces</em> here include ORB, POA, connections,
+      profiles.... that provide services for CORBA invocations.</p>
   </li>
 </ul>
 
@@ -52,6 +45,21 @@ Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
 <a name="issues"><h3>Known issues:</h3></a>
 
 <ul>
+  <li><p>Since collocated objects run in the client thread's context,
+      calling <code>CORBA::ORB::shutdown()</code> does <em>not</em>
+      actually close down the target ORB but instead on the client
+      side ORB.  This issue will be addressed in the new ORB Core
+      architecture.</p>
+
+      <p>Also, since the collocated invocations circumvent POA
+      completely, POA Current won't get set up, LOCATION_FORWARD will
+      not work, race condition may occur when several threads invoke
+      operations on an objects registered with POAs with SINGLE_THREAD
+      policy, operation invocations will still get thru even the POA
+      is in holding state, or invoking operations on a servant that
+      has already been deactivated.</p>
+  </li>
+
   <li><p>When using the thread-per-connection concurrency model, if
       some client leave the socket connection open without sending any
       request, the server will crash on NT.  This is because we are
@@ -65,6 +73,26 @@ Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
       down.  But this is not portable and only works on NT.</p>
   </li>
 
+  <li><p>Some CORBA objects need to have access to the ORB. We tend to
+      use <code>TAO_ORB_Core_instance()->orb()</code> to fetch the
+      right ORB the object is using. This is most often true when
+      implementing the shutdown method which allow other process to
+      shutdown a remote ORB. Althought this may be the "right" thing
+      to do in TAO, it is not CORBA compliant and hurts the
+      portability of object implementation.  A common way of getting
+      around this problem is to cache the ORB pointer in the object
+      when it is created and simply use the cached ORB when needed.
+      However, remember that there could be multiple ORBs in a process
+      and a POA may be shared by several ORBs. That means, we may not
+      handling the object with the same ORB it was
+      created. Collocation optimization further complicated the
+      problem.</p>
+
+      <p> At the moment, using
+      <code>TAO_ORB_Core_instance()->orb()</code> is the only sane way
+      to get arond the problem. Though there may be a better way.</p>
+  </li>
+
   <li><p>Object references for objects dynamically created within a
       server may not have proper host. When an object is dynamically
       created and its object reference returned, it simply has to
@@ -417,19 +445,6 @@ new ORB Core structure.
 	</p>
   </li>
 
-  <li><p>We implemented <CODE>GIOP 1.1</CODE>, including the support
-	  for tagged components in IIOP profiles.
-	</p>
-  </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 
-      is still supported using by specifying the -ORBCollocationStrategy direct
-      command option (because the original scheme has slightly less method 
-      invocation overhead.)
-  </li>
-
 </ul>
 <!-- --------------------- -->
 <a href="#toc">Back to TOC</a>
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h
index f6c78546baa..ee80fec7576 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h
@@ -64,7 +64,7 @@ public:
   int run (void);
   // Start the ORB object.
 
-  const char *stock_name_;
+  char *stock_name_;
   // the name of the stock the consumer is interested in.
 
   int threshold_value_;
@@ -79,6 +79,7 @@ public:
   Callback_Quoter::Consumer_var consumer_var_;
   // Pointer to the consumer object registered with the ORB.
 
+
   ACE_Reactor* reactor_used (void) const;
   // This method gives the reactor pointer.
 
@@ -91,10 +92,6 @@ public:
   // the Notifier-server.
 
 private:
-  
-  CORBA::ORB_var orb_;
-  // Our orb.
-
   int read_ior (char *filename);
   // Function to read the server IOR from a file.
 
@@ -129,6 +126,9 @@ private:
   // This variable denotes whether the naming service
   // is used or not.
 
+  CORBA::ORB_var orb_;
+  // Our orb.
+
  Consumer_Input_Handler *consumer_input_handler_;
   // Reference to the input_event_handler.
 
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h
index 63eef5a0380..0c1b67b77ae 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.h
+++ b/TAO/examples/Callback_Quoter/Consumer_i.h
@@ -50,12 +50,12 @@ public:
   // Set the ORB pointer.
 
 private:
+    int quit_;
+  // If 1 denotes that the consumer is dead else alive.
+ 
   CORBA::ORB_var orb_;
   // ORB pointer.
 
-  int quit_;
-  // If 1 denotes that the consumer is dead else alive.
- 
   // @@ Please rename to Notifier.
   Notifier_var server_;
   // Smart pointer to the Notifier object.
diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile
index 8fec8d8a436..04959c69834 100644
--- a/TAO/examples/Callback_Quoter/Makefile
+++ b/TAO/examples/Callback_Quoter/Makefile
@@ -266,7 +266,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -286,25 +297,14 @@ 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/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/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 \
@@ -320,8 +320,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -360,7 +359,6 @@ realclean: clean
  $(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 \
@@ -521,7 +519,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -541,25 +550,14 @@ 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/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/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 \
@@ -575,8 +573,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -615,7 +612,6 @@ realclean: clean
  $(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 \
@@ -776,7 +772,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -796,25 +803,14 @@ 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/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/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 \
@@ -830,8 +826,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -870,7 +865,6 @@ realclean: clean
  $(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 \
@@ -1030,7 +1024,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1050,25 +1055,14 @@ 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/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/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 \
@@ -1084,8 +1078,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1124,7 +1117,6 @@ realclean: clean
  $(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 \
@@ -1283,7 +1275,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1303,25 +1306,14 @@ 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/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/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 \
@@ -1337,8 +1329,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1377,7 +1368,6 @@ realclean: clean
  $(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 \
@@ -1566,7 +1556,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1586,25 +1587,14 @@ 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/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/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 \
@@ -1620,8 +1610,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1660,7 +1649,6 @@ realclean: clean
  $(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 \
@@ -1850,7 +1838,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1870,25 +1869,14 @@ 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/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/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 \
@@ -1904,8 +1892,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1944,7 +1931,6 @@ realclean: clean
  $(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 \
@@ -2129,7 +2115,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2149,25 +2146,14 @@ 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/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/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 \
@@ -2183,8 +2169,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2223,7 +2208,6 @@ realclean: clean
  $(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 \
@@ -2407,7 +2391,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2427,25 +2422,14 @@ 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/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/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 \
@@ -2461,8 +2445,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2501,7 +2484,6 @@ realclean: clean
  $(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 \
@@ -2688,7 +2670,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2708,25 +2701,14 @@ 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/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/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 \
@@ -2742,8 +2724,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2782,7 +2763,6 @@ realclean: clean
  $(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 \
@@ -2970,7 +2950,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2990,25 +2981,14 @@ 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/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/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 \
@@ -3024,8 +3004,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3064,7 +3043,6 @@ realclean: clean
  $(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 \
@@ -3226,7 +3204,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3246,25 +3235,14 @@ 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/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/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 \
@@ -3280,8 +3258,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3320,7 +3297,6 @@ realclean: clean
  $(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 \
@@ -3483,7 +3459,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3503,25 +3490,14 @@ 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/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/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 \
@@ -3537,8 +3513,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3577,7 +3552,6 @@ realclean: clean
  $(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 \
@@ -3767,7 +3741,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3787,25 +3772,14 @@ 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/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/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 \
@@ -3821,8 +3795,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3861,7 +3834,6 @@ realclean: clean
  $(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 \
@@ -4050,7 +4022,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -4070,25 +4053,14 @@ 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/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/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 \
@@ -4104,8 +4076,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4144,7 +4115,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.h b/TAO/examples/Callback_Quoter/Supplier_i.h
index c547ae74ddb..541dd08104b 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.h
+++ b/TAO/examples/Callback_Quoter/Supplier_i.h
@@ -63,9 +63,6 @@ public:
   // periodically.
 
 private:
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
   int read_ior (char *filename);
   // Function to read the Notifier IOR from a file.
 
@@ -91,7 +88,7 @@ private:
   char *ior_;
   // IOR of the obj ref of the Notifier.
   
-  CORBA::Environment env_;
+    CORBA::Environment env_;
   // Environment variable.
 
   TAO_Naming_Client naming_services_client_;
@@ -105,6 +102,9 @@ private:
   Notifier_var notifier_;
   // Notifier object reference.
 
+   CORBA::ORB_var orb_;
+  // Remember our orb.
+
   FILE  *f_ptr_;
   // The pointer for accessing the input stream.
 
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h
index f4b031644d5..69219365550 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.h
+++ b/TAO/examples/Event_Comm/Consumer_Handler.h
@@ -68,9 +68,6 @@ private:
   // gets the notifier reference from the naming service.
   // returns 0 on success, -1 on error.
 
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
   Consumer_i receiver_i_;
   // The <Consumer> implementation.
 
@@ -84,6 +81,9 @@ private:
   // An instance of the name client used for resolving the factory
   // objects.
 
+  CORBA::ORB_var orb_;
+  // Remember our orb.
+
   ShutdownCallback* shutdowncallback;
   // The Shutdown callback used to shutdown the consumer application.
 };
diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile
index dd0ee8dfb57..e62fa707ae9 100644
--- a/TAO/examples/Event_Comm/Makefile
+++ b/TAO/examples/Event_Comm/Makefile
@@ -258,7 +258,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -278,25 +289,14 @@ 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 \
- $(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/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 \
@@ -312,8 +312,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -352,7 +351,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -512,7 +510,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -532,25 +541,14 @@ 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 \
- $(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/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 \
@@ -566,8 +564,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -606,7 +603,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -771,7 +767,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -788,25 +795,14 @@ 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 \
- $(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/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 \
@@ -822,8 +818,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -862,7 +857,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1051,7 +1045,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1068,25 +1073,14 @@ 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 \
- $(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/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 \
@@ -1102,8 +1096,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1142,7 +1135,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1329,7 +1321,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1346,25 +1349,14 @@ 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 \
- $(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/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 \
@@ -1380,8 +1372,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1420,7 +1411,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1588,7 +1578,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1605,25 +1606,14 @@ 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 \
- $(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/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 \
@@ -1639,8 +1629,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1679,7 +1668,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1866,7 +1854,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1883,25 +1882,14 @@ 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 \
- $(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/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 \
@@ -1917,8 +1905,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1957,7 +1944,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2148,7 +2134,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2165,25 +2162,14 @@ 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 \
- $(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/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 \
@@ -2199,8 +2185,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2239,7 +2224,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2427,7 +2411,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2444,25 +2439,14 @@ 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 \
- $(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/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 \
@@ -2478,8 +2462,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2518,7 +2501,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2711,7 +2693,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2728,25 +2721,14 @@ 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 \
- $(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/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 \
@@ -2762,8 +2744,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2802,7 +2783,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2991,7 +2971,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3008,25 +2999,14 @@ 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 \
- $(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/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 \
@@ -3042,8 +3022,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3082,7 +3061,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h
index b1bf0dce4a3..cf83f94de6f 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.h
+++ b/TAO/examples/Event_Comm/Notifier_Handler.h
@@ -62,9 +62,6 @@ public:
   // returns the ORB's reactor.
 
 private:
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
   Event_Comm::Notifier *notifier_;
   // Pointer to an <Event_Comm::Notifier> object.
 
@@ -72,6 +69,9 @@ private:
   // An instance of the name client used for resolving the factory
   // objects.
 
+  CORBA::ORB_var orb_;
+  // Remember our orb.
+
   ShutdownCallback *shutdowncallback;
   // The handler to shutdown the app.
 };
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 23517560f11..93ff0c293f3 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -6,7 +6,6 @@
 #ifndef SIMPLE_UTIL_C
 #define SIMPLE_UTIL_C
 # include "Simple_util.h"
-# include "tao/debug.h"
 
 // Constructor.
 
diff --git a/TAO/examples/OBV/Typed_Events/Makefile b/TAO/examples/OBV/Typed_Events/Makefile
index 66f1c59993d..b330e712e53 100644
--- a/TAO/examples/OBV/Typed_Events/Makefile
+++ b/TAO/examples/OBV/Typed_Events/Makefile
@@ -230,7 +230,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -250,25 +261,14 @@ 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/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/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 \
@@ -284,8 +284,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -324,7 +323,6 @@ realclean: clean
  $(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 \
@@ -484,7 +482,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -504,25 +513,14 @@ 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/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/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 \
@@ -538,8 +536,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -578,7 +575,6 @@ realclean: clean
  $(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 \
@@ -746,7 +742,16 @@ realclean: clean
  $(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 \
@@ -768,21 +773,12 @@ realclean: clean
  $(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/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 \
@@ -798,8 +794,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -838,7 +833,6 @@ realclean: clean
  $(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 \
@@ -1005,7 +999,16 @@ realclean: clean
  $(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 \
@@ -1027,21 +1030,12 @@ realclean: clean
  $(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/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 \
@@ -1057,8 +1051,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1097,7 +1090,6 @@ realclean: clean
  $(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 \
@@ -1257,7 +1249,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1277,25 +1280,14 @@ 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/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/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 \
@@ -1311,8 +1303,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1351,7 +1342,6 @@ realclean: clean
  $(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 \
@@ -1519,7 +1509,16 @@ realclean: clean
  $(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 \
@@ -1541,21 +1540,12 @@ realclean: clean
  $(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/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 \
@@ -1571,8 +1561,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1611,7 +1600,6 @@ realclean: clean
  $(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 \
@@ -1771,7 +1759,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1791,25 +1790,14 @@ 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/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/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 \
@@ -1825,8 +1813,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1865,7 +1852,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile b/TAO/examples/POA/Adapter_Activator/Makefile
index 6883298d0ff..6b5f8fc80d4 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile
+++ b/TAO/examples/POA/Adapter_Activator/Makefile
@@ -189,7 +189,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -209,25 +220,14 @@ 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 \
- $(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/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 \
@@ -243,8 +243,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -283,7 +282,6 @@ endif
  $(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 \
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl
index ab75bdeaaee..18df6a4317a 100755
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ b/TAO/examples/POA/Adapter_Activator/run_test.pl
@@ -60,66 +60,19 @@ unlink $iorfile_2;
 unlink $iorfile_3;
 
 $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
-if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-if (ACE::waitforfile_timed ($iorfile_3, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_3>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL_1  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_2");
-$CL_3  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_3 -x");
 
+ACE::waitforfile ($iorfile_1);
+ACE::waitforfile ($iorfile_2);
+ACE::waitforfile ($iorfile_3);
 
-$client_1 = $CL_1->TimedWait (60);
-if ($client_1 == -1) {
-  print STDERR "ERROR: client 1 timedout\n";
-  $CL_1->Kill (); $CL_1->TimedWait (1);
-}
-
-$client_2 = $CL_2->TimedWait (60);
-if ($client_2 == -1) {
-  print STDERR "ERROR: client 2 timedout\n";
-  $CL_2->Kill (); $CL_2->TimedWait (1);
-}
-
-$client_3 = $CL_3->TimedWait (60);
-if ($client_3 == -1) {
-  print STDERR "ERROR: client 3 timedout\n";
-  $CL_3->Kill (); $CL_3->TimedWait (1);
-}
-
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_3 -x");
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 unlink $iorfile_3;
 
-if ($server != 0 ||
-    $client_1 != 0 ||
-    $client_2 != 0 ||
-    $client_3 != 0 )
-{
-  exit 1;
-}
+$SV->Wait ();
 
-exit 0;
+exit $status;
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index 851c2e48212..a8c998cfa1f 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -147,9 +147,6 @@ DatabaseImpl::Agent::create_entry (const char *key,
                                    const char *entry_type,
                                    const Database::NVPairSequence &initial_attributes,
                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Database::Unknown_Type,
-                   Database::Duplicate_Key))
 {
   // Create a new entry in the database:
   if (ACE_OS::strcmp (entry_type, "Employee") != 0 ||
@@ -204,9 +201,6 @@ Database::Entry_ptr
 DatabaseImpl::Agent::find_entry (const char *key,
                                  const char *entry_type,
                                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Database::Unknown_Type,
-                   Database::Not_Found))
 {
   if (ACE_OS::strcmp (entry_type, "Employee") != 0)
     {
@@ -257,9 +251,6 @@ void
 DatabaseImpl::Agent::destroy_entry (const char *key,
                                     const char *entry_type,
                                     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Database::Unknown_Type,
-                   Database::Unknown_Key))
 {
   if (ACE_OS::strcmp (entry_type, "Employee") != 0)
     {
@@ -292,7 +283,6 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
 
 void
 DatabaseImpl::Agent::shutdown (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
@@ -341,14 +331,12 @@ DatabaseImpl::Employee::~Employee (void)
 
 const char *
 DatabaseImpl::Employee::name (void) const
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->name_;
 }
 
 void
 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);
@@ -357,14 +345,12 @@ DatabaseImpl::Employee::name (const char* name)
 
 CORBA::Long
 DatabaseImpl::Employee::id (void) const
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->id_;
 }
 
 void
 DatabaseImpl::Employee::id (CORBA::Long id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->id_ = id;
 }
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index 3824d71f23b..b48464d3b7f 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -50,7 +50,7 @@ public:
     // Returns the default POA for this servant.
 
     virtual void is_a (CORBA::ServerRequest_ptr request,
-                       CORBA::Environment &env);
+                        CORBA::Environment &env);
     // Handles the _is_a call
 
   protected:
@@ -75,27 +75,17 @@ public:
     virtual Database::Entry_ptr create_entry (const char *key,
                                               const char *entry_type,
                                               const Database::NVPairSequence &initial_attributes,
-                                              CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Database::Unknown_Type,
-                       Database::Duplicate_Key));
+                                              CORBA::Environment &env);
 
     virtual Database::Entry_ptr find_entry (const char *key,
                                             const char *entry_type,
-                                            CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Database::Unknown_Type,
-                       Database::Not_Found));
+                                            CORBA::Environment &env);
 
     virtual void destroy_entry (const char *key,
                                 const char *entry_type,
-                                CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Database::Unknown_Type,
-                       Database::Unknown_Key));
+                                CORBA::Environment &env);
 
-    virtual void shutdown (CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void shutdown (CORBA::Environment &env);
 
     virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
     // Returns the default POA for this servant.
@@ -120,15 +110,11 @@ public:
 
     ~Employee (void);
 
-    const char *name (void) const
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    void name (const char* name)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    const char *name (void) const;
+    void name (const char* name);
 
-    CORBA::Long id (void) const
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    void id (CORBA::Long id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    CORBA::Long id (void) const;
+    void id (CORBA::Long id);
 
     void *operator new (size_t);
     void operator delete (void *pointer);
diff --git a/TAO/examples/POA/DSI/Makefile b/TAO/examples/POA/DSI/Makefile
index 802cb57d505..bfb43678bf8 100644
--- a/TAO/examples/POA/DSI/Makefile
+++ b/TAO/examples/POA/DSI/Makefile
@@ -201,7 +201,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -221,25 +232,14 @@ 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/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/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 \
@@ -255,8 +255,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -295,7 +294,6 @@ realclean: clean
  $(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 \
@@ -455,7 +453,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -475,25 +484,14 @@ 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/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/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 \
@@ -509,8 +507,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -549,7 +546,6 @@ realclean: clean
  $(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 \
@@ -708,7 +704,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -728,25 +735,14 @@ 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/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/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 \
@@ -762,8 +758,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -802,7 +797,6 @@ realclean: clean
  $(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 \
@@ -968,7 +962,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -988,25 +993,14 @@ 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/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/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 \
@@ -1022,8 +1016,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1062,7 +1055,6 @@ realclean: clean
  $(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 \
@@ -1221,7 +1213,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1241,25 +1244,14 @@ 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/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/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 \
@@ -1275,8 +1267,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1315,7 +1306,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/POA/DSI/run_test.pl b/TAO/examples/POA/DSI/run_test.pl
index c914fa21047..f81e9b9c09a 100755
--- a/TAO/examples/POA/DSI/run_test.pl
+++ b/TAO/examples/POA/DSI/run_test.pl
@@ -14,31 +14,12 @@ unlink $iorfile;
 
 $SV = Process::Create ($EXEPREFIX."server$Process::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$Process::EXE_EXT ",
-		       " -f $iorfile -x");
-
-$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 $iorfile;
+ACE::waitforfile ($iorfile);
+
+$status  = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile -x");
 
-if ($server != 0 || $client != 0) {
-  exit 1;
-}
+$SV->Wait ();
+
+unlink $iorfile;
 
-exit 0;
+exit $status;
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index e1b3ea6f16a..42096598455 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -44,13 +44,10 @@ File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
                         CORBA::Long flags,
                         CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   // Do an ACE_OS::open
   ACE_HANDLE file_descriptor = ACE_OS::open (file_name,
-                                             flags,
-                                             0644);
+                                             flags);
 
   if (file_descriptor == ACE_INVALID_HANDLE)
     {
@@ -119,7 +116,7 @@ FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
   // Get the ObjectId from the reference
   PortableServer::ObjectId_var oid =
     this->poa_->reference_to_id (me.in (), ACE_TRY_ENV);
-
+  
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
     // Convert the ObjectId to a string
@@ -133,8 +130,6 @@ FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
 CORBA::Long
 FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
                              CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -153,8 +148,6 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
 File::Descriptor::DataBuffer *
 FileImpl::Descriptor::read (CORBA::Long num_bytes,
                             CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -176,8 +169,6 @@ CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
                              CORBA::Long whence,
                              CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   File::IOError))
 {
   ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -193,7 +184,6 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 
 void
 FileImpl::Descriptor::destroy (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ACE_HANDLE for this object reference
   ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h
index fdca0289a08..736789654cf 100644
--- a/TAO/examples/POA/Default_Servant/File_i.h
+++ b/TAO/examples/POA/Default_Servant/File_i.h
@@ -22,8 +22,8 @@ class FileImpl
 {
 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
+    // Descriptor implements the Descriptor interface in the File Module
+    // A single Descriptor servant can serve multiple object references
   {
   public:
     //Constructor
@@ -37,25 +37,18 @@ public:
 
     // 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));
+                               CORBA::Environment &env);
 
     // 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,
-                       File::IOError));
+                                                CORBA::Environment &env);
     // 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));
+                                CORBA::Environment &env);
 
     // closes the file corresponding to the requested ObjectID
-    virtual void destroy (CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void destroy (CORBA::Environment &env);
 
   private:
 
@@ -66,7 +59,7 @@ public:
   };
 
   class System : public POA_File::System
-  // File System implementation class
+    // File System implementation class
   {
   public:
     // Constructor, Creates a single File Descriptor Servant and
@@ -83,9 +76,7 @@ public:
     // 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));
+                               CORBA::Environment &env);
 
   private:
     PortableServer::POA_var poa_;
@@ -95,3 +86,4 @@ public:
     Descriptor fd_servant_;
   };
 };
+
diff --git a/TAO/examples/POA/Default_Servant/Makefile b/TAO/examples/POA/Default_Servant/Makefile
index 85b4a54f002..6eda3f255cc 100644
--- a/TAO/examples/POA/Default_Servant/Makefile
+++ b/TAO/examples/POA/Default_Servant/Makefile
@@ -201,7 +201,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -221,25 +232,14 @@ 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/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/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 \
@@ -255,8 +255,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -295,7 +294,6 @@ realclean: clean
  $(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 \
@@ -454,7 +452,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -474,25 +483,14 @@ 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/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/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 \
@@ -508,8 +506,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -548,7 +545,6 @@ realclean: clean
  $(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 \
@@ -710,7 +706,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -730,25 +737,14 @@ 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/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/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 \
@@ -764,8 +760,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -804,7 +799,6 @@ realclean: clean
  $(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 \
@@ -968,7 +962,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -988,25 +993,14 @@ 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/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/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 \
@@ -1022,8 +1016,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1062,7 +1055,6 @@ realclean: clean
  $(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 \
@@ -1221,7 +1213,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1241,25 +1244,14 @@ 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/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/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 \
@@ -1275,8 +1267,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1315,7 +1306,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp
index 5332f16d54c..f031e9f6874 100644
--- a/TAO/examples/POA/Default_Servant/client.cpp
+++ b/TAO/examples/POA/Default_Servant/client.cpp
@@ -75,6 +75,9 @@ main (int argc, char **argv)
 
   ACE_TRY
     {
+
+      char* ior=0;
+
       // Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -99,20 +102,16 @@ main (int argc, char **argv)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Unable to read ior\n"),
                           -1);
-
-      ACE_CString ior = data;
+      ior = ACE_OS::strdup (data);
       ior_buffer.alloc ()-> free (data);
       ACE_OS::close (input_file);
 
-      CORBA::Object_var object = orb->string_to_object (ior.c_str (),
-                                                        ACE_TRY_ENV);
+      CORBA::Object_var object = orb->string_to_object (ior, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a File::System
       File::System_var file_system = File::System::_narrow (object.in (),
                                                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       // Creat the file filename i.e "test"
       File::Descriptor_var fd = file_system->open (filename,
                                                    O_CREAT | O_RDWR,
@@ -149,7 +148,6 @@ main (int argc, char **argv)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/POA/Default_Servant/run_test.pl b/TAO/examples/POA/Default_Servant/run_test.pl
index 129744c1a63..e391e365f5e 100755
--- a/TAO/examples/POA/Default_Servant/run_test.pl
+++ b/TAO/examples/POA/Default_Servant/run_test.pl
@@ -12,31 +12,14 @@ $iorfile = "server.ior";
 
 unlink $iorfile;
 
-$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
-		       " -o $iorfile");
+$SV = Process::Create ($EXEPREFIX."server$Process::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;
-}
+ACE::waitforfile ($iorfile);
 
-$CL  = Process::Create ($EXEPREFIX."client$Process::EXE_EXT ",
-			" -k $iorfile");
+$status  = system ($EXEPREFIX."client$Process::EXE_EXT -k $iorfile");
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
-$SV->Kill (); $SV->TimedWait (1);
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
-unlink "test"; # created by the program
-
-if ($client != 0) {
-  exit 1;
-}
 
-exit 0;
+exit $status;
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index 7b8a277c3b0..215f301845b 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -54,136 +54,124 @@ parse_args (int argc, char **argv)
   return 0;
 }
 
-
 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;
+  // Initialize the ORB
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      int result = parse_args (argc, argv);
-      if (result != 0)
-        return result;
+  int result = parse_args (argc, argv);
+  if (result != 0)
+    return result;
 
-      // Get the Root POA object reference
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+  // Get the Root POA object reference
+  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
-      // Narrow the object reference to a POA reference
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Narrow the object reference to a POA reference
+  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      CORBA::PolicyList policies (5);
-      policies.length (5);
+  CORBA::PolicyList policies (5);
+  policies.length (5);
 
   // ID Assignment Policy
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Lifespan Policy
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Request Processing Policy
-      policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Servant Retention Policy
-      policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Id Uniqueness Policy
-      policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_CString name = "firstPOA";
-      PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
-                                                                poa_manager.in (),
-                                                                policies,
-                                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      for (CORBA::ULong i = 0;
-           i < policies.length () && ACE_TRY_ENV.exception () == 0;
-           ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;  
-        }
-      
-
-
-      // Create a File System Implementation object in first_poa
-      FileImpl::System file_system_impl (first_poa.in ());
-
-      PortableServer::ObjectId_var file_system_oid =
-        PortableServer::string_to_ObjectId ("FileSystem");
-
-      first_poa->activate_object_with_id (file_system_oid.in (),
-                                          &file_system_impl,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var file_system =
-        first_poa->id_to_reference (file_system_oid.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the IOR for the "FileSystem" object
-      CORBA::String_var file_system_ior =
-        orb->object_to_string (file_system.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,"%s\n",
-                    file_system_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", file_system_ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      // set the state of the poa_manager to active i.e 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 rootPOA and its children
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  policies[0] =
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Lifespan Policy
+  policies[1] =
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Request Processing Policy
+  policies[2] =
+    root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Servant Retention Policy
+  policies[3] =
+    root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Id Uniqueness Policy
+  policies[4] =
+    root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  ACE_CString name = "firstPOA";
+  PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
+                                                            poa_manager.in (),
+                                                            policies,
+                                                            ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  for (CORBA::ULong i = 0;
+       i < policies.length () && ACE_TRY_ENV.exception () == 0;
+       ++i)
+    {
+      CORBA::Policy_ptr policy = policies[i];
+      policy->destroy (ACE_TRY_ENV);
     }
-  ACE_CATCHANY
+  ACE_CHECK_RETURN (-1);
+
+
+  // Create a File System Implementation object in first_poa
+  FileImpl::System file_system_impl (first_poa.in ());
+
+  PortableServer::ObjectId_var file_system_oid =
+    PortableServer::string_to_ObjectId ("FileSystem");
+
+  first_poa->activate_object_with_id (file_system_oid.in (),
+                                      &file_system_impl,
+                                      ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  CORBA::Object_var file_system =
+    first_poa->id_to_reference (file_system_oid.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Get the IOR for the "FileSystem" object
+  CORBA::String_var file_system_ior =
+    orb->object_to_string (file_system.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,"%s\n",
+		file_system_ior.in ()));
+
+  // If the ior_output_file exists, output the ior to it
+  if (ior_output_file != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EXCEPTION CAUGHT");
-      return -1;
+      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", file_system_ior.in ());
+      ACE_OS::fclose (output_file);
     }
-  ACE_ENDTRY;
+
+  // set the state of the poa_manager to active i.e ready to process requests
+  poa_manager->activate (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Run the ORB
+  if (orb->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+
+  // Destroy the rootPOA and its children
+  root_poa->destroy (1,
+                     1,
+                     ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile
index 0468ff06cbe..a2dae1aeeba 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile
+++ b/TAO/examples/POA/Explicit_Activation/Makefile
@@ -191,7 +191,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -211,25 +222,14 @@ 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 \
- $(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/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 \
@@ -245,8 +245,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -285,7 +284,6 @@ endif
  $(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 \
diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl
index 7006effaafc..18df6a4317a 100755
--- a/TAO/examples/POA/Explicit_Activation/run_test.pl
+++ b/TAO/examples/POA/Explicit_Activation/run_test.pl
@@ -59,72 +59,20 @@ unlink $iorfile_1;
 unlink $iorfile_2;
 unlink $iorfile_3;
 
-
 $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
 
-if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-if (ACE::waitforfile_timed ($iorfile_3, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_3>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL_1  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_2");
-$CL_3  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_3 -x");
-
-
-$client_1 = $CL_1->TimedWait (60);
-if ($client_1 == -1) {
-  print STDERR "ERROR: client 1 timedout\n";
-  $CL_1->Kill (); $CL_1->TimedWait (1);
-}
-
-$client_2 = $CL_2->TimedWait (60);
-if ($client_2 == -1) {
-  print STDERR "ERROR: client 2 timedout\n";
-  $CL_2->Kill (); $CL_2->TimedWait (1);
-}
-
-$client_3 = $CL_3->TimedWait (60);
-if ($client_3 == -1) {
-  print STDERR "ERROR: client 3 timedout\n";
-  $CL_3->Kill (); $CL_3->TimedWait (1);
-}
-
+ACE::waitforfile ($iorfile_1);
+ACE::waitforfile ($iorfile_2);
+ACE::waitforfile ($iorfile_3);
 
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_3 -x");
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 unlink $iorfile_3;
 
-if ($server != 0 ||
-    $client_1 != 0 ||
-    $client_2 != 0 ||
-    $client_3 != 0)
-{
-  exit 1;
-}
-
-exit 0;
-
+$SV->Wait ();
 
+exit $status;
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index 91021c1b9a9..44edc46c1b2 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -45,16 +45,8 @@ main (int argc, char **argv)
         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;
-
       // Get a TAO_Adapter_Activator reference
-      TAO_Adapter_Activator activator_impl (poa_manager.in ());
+      TAO_Adapter_Activator activator_impl;
 
       ACE_OS::strcpy (str, "TAO_Adapter_Activator::_this");
       PortableServer::AdapterActivator_var activator =
diff --git a/TAO/examples/POA/FindPOA/Makefile b/TAO/examples/POA/FindPOA/Makefile
index 03d6af1082f..4ef99ef19d1 100644
--- a/TAO/examples/POA/FindPOA/Makefile
+++ b/TAO/examples/POA/FindPOA/Makefile
@@ -186,7 +186,18 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -206,25 +217,14 @@ 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 \
- $(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/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 \
@@ -240,8 +240,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -280,7 +279,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 \
diff --git a/TAO/examples/POA/FindPOA/run_test.pl b/TAO/examples/POA/FindPOA/run_test.pl
index ee0c863b9a6..38a074d6601 100755
--- a/TAO/examples/POA/FindPOA/run_test.pl
+++ b/TAO/examples/POA/FindPOA/run_test.pl
@@ -8,12 +8,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 unshift @INC, '../../../../bin';
 require ACEutils;
 
-$TEST  = Process::Create ($EXEPREFIX."FindPOA$Process::EXE_EXT","");
+$status  = system ($EXEPREFIX."FindPOA$Process::EXE_EXT");
 
-if ($TEST->TimedWait (60) == -1){
-  print STDERR "ERROR: test timedout\n";
-  $TEST->Kill (); $TEST->TimedWait(1);
-  exit 1;
-}
-
-exit 0;
+exit $status;
diff --git a/TAO/examples/POA/Forwarding/Makefile b/TAO/examples/POA/Forwarding/Makefile
index e6cfa81348a..e9c87efdee0 100644
--- a/TAO/examples/POA/Forwarding/Makefile
+++ b/TAO/examples/POA/Forwarding/Makefile
@@ -201,7 +201,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -221,25 +232,14 @@ 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/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/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 \
@@ -255,8 +255,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -295,7 +294,6 @@ realclean: clean
  $(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 \
@@ -454,7 +452,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -474,25 +483,14 @@ 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/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/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 \
@@ -508,8 +506,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -548,7 +545,6 @@ realclean: clean
  $(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 \
@@ -707,7 +703,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -727,25 +734,14 @@ 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/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/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 \
@@ -761,8 +757,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -801,7 +796,6 @@ realclean: clean
  $(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 \
@@ -965,7 +959,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -985,25 +990,14 @@ 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/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/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 \
@@ -1019,8 +1013,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1059,7 +1052,6 @@ realclean: clean
  $(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 \
@@ -1222,7 +1214,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1242,25 +1245,14 @@ 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/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/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 \
@@ -1276,8 +1268,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1316,7 +1307,6 @@ realclean: clean
  $(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 \
@@ -1476,7 +1466,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1496,25 +1497,14 @@ 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/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/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 \
@@ -1530,8 +1520,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1570,7 +1559,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/POA/Forwarding/MyFooServant.cpp b/TAO/examples/POA/Forwarding/MyFooServant.cpp
index ea9a9dcd5ec..45870b3aa69 100644
--- a/TAO/examples/POA/Forwarding/MyFooServant.cpp
+++ b/TAO/examples/POA/Forwarding/MyFooServant.cpp
@@ -24,121 +24,74 @@ MyFirstFooServant::MyFirstFooServant (CORBA::ORB_ptr orb_ptr,
                                       PortableServer::POA_ptr poa_ptr,
                                       CORBA::Long value,
                                       CORBA::Object_ptr forward_to_ptr)
-  : orb_ (CORBA::ORB::_duplicate (orb_ptr)),
-    poa_ (PortableServer::POA::_duplicate (poa_ptr)),
+  : orb_var_ (CORBA::ORB::_duplicate (orb_ptr)),
+    poa_var_ (PortableServer::POA::_duplicate (poa_ptr)),
     value_ (value),
     forward_to_var_ (CORBA::Object::_duplicate (forward_to_ptr))
 {
   if (CORBA::is_nil (this->forward_to_var_.in ()))
     ACE_DEBUG ((LM_DEBUG,
                 "POA approach: Forward_to is nil!\n"));
-
-  // Assign this object 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_ != ACE_INVALID_HANDLE);
-
-  // Register handle.  Note that NULL_MASK is used to keep the
-  // ACE_Reactor from calling us back on the ACE_DEV_NULL descriptor.
-  int result = this->orb_->orb_core ()->reactor ()->
-    register_handler (this->handle_, this, ACE_Event_Handler::NULL_MASK);
-  ACE_ASSERT (result == 0);
 }
 
 // Destructor
 MyFirstFooServant::~MyFirstFooServant (void)
 {
-  int result = this->orb_->orb_core ()->reactor ()->
-    remove_handler (this->handle_, ACE_Event_Handler::NULL_MASK);
-  ACE_ASSERT (result == 0);
 }
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
 MyFirstFooServant::_default_POA (CORBA::Environment &/*env*/)
 {
-  return PortableServer::POA::_duplicate (this->poa_.in ());
+  return PortableServer::POA::_duplicate (this->poa_var_.in ());
 }
 
 // Return this->value
 CORBA::Long
 MyFirstFooServant::doit (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_++;
 }
 
 void
 MyFirstFooServant::shutdown (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown();
+  this->orb_var_->shutdown();
 }
 
 
-void
+void 
 MyFirstFooServant::forward (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Foo::Cannot_Forward))
 {
   ACE_DEBUG ((LM_DEBUG,
               "MyFirstFooServant::forward: being called\n"));
   if (!CORBA::is_nil (this->forward_to_var_.in ()))
     {
-      //
-      // This is a *hack*!  We cannot ask the POA to replace 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 replace us.
-      //
-
-      int result = this->orb_->orb_core ()->reactor ()->ready_ops
-	(this->handle_,
-         ACE_Event_Handler::READ_MASK,
-         ACE_Reactor::ADD_MASK);
-      ACE_ASSERT (result != -1);
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "POA approach: Forward_to refenence is nil.\n"));
-      ACE_THROW (Foo::Cannot_Forward ());
-    }
-}
-
-int
-MyFirstFooServant::handle_input (ACE_HANDLE)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
       PortableServer::ObjectId_var oid =
-        this->poa_->servant_to_id (this, ACE_TRY_ENV);
+        this->poa_var_->servant_to_id (this, ACE_TRY_ENV);
       ACE_CHECK;
 
-      PortableServer::Servant servant = this->poa_->_servant ();
-      ACE_ASSERT (servant != 0);
-
+      PortableServer::Servant servant = this->poa_var_->_servant ();
+      if (servant == 0)
+        {
+          ACE_THROW (Foo::Cannot_Forward ());
+        }
+      
       void *ptr = servant->_downcast ("IDL:omg.org/PortableServer/POA:1.0");
       POA_PortableServer::POA *poa = (POA_PortableServer::POA *) ptr;
       TAO_POA *tao_poa = ACE_dynamic_cast (TAO_POA *, poa);
-
+      
       tao_poa->forward_object (oid.in (),
                                this->forward_to_var_.in (),
                                ACE_TRY_ENV);
-      ACE_CHECK;
     }
-  ACE_CATCHANY
+  else
     {
-      ACE_ASSERT (1 == 0);
+      ACE_DEBUG ((LM_DEBUG,
+                  "POA approach: Forward_to refenence is nil.\n"));
+      ACE_THROW (Foo::Cannot_Forward ());
     }
-  ACE_ENDTRY;
-
-  return 0;
-};
+}
 
 // Second Foo
 
@@ -146,7 +99,7 @@ MyFirstFooServant::handle_input (ACE_HANDLE)
 MySecondFooServant::MySecondFooServant (CORBA::ORB_ptr orb_ptr,
                                         MyFooServantLocator *locator_ptr,
                                         CORBA::Long value)
-  : orb_ (CORBA::ORB::_duplicate (orb_ptr)),
+  : orb_var_ (CORBA::ORB::_duplicate (orb_ptr)),
     locator_ptr_ (locator_ptr),
     value_ (value)
 {
@@ -161,15 +114,12 @@ MySecondFooServant::~MySecondFooServant (void)
 // Return this->value
 CORBA::Long
 MySecondFooServant::doit (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_++;
 }
 
-void
+void 
 MySecondFooServant::forward (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Foo::Cannot_Forward))
 {
   // forward the forwarding request to the Servant Locator :-) This is
   // kind of a loop back, but it is correct only the IDL interface can
@@ -181,7 +131,7 @@ MySecondFooServant::forward (CORBA::Environment &ACE_TRY_ENV)
 
 void
 MySecondFooServant::shutdown (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown();
+  this->orb_var_->shutdown();
 }
+
diff --git a/TAO/examples/POA/Forwarding/MyFooServant.h b/TAO/examples/POA/Forwarding/MyFooServant.h
index ed92d5d4dc3..7534f403a33 100644
--- a/TAO/examples/POA/Forwarding/MyFooServant.h
+++ b/TAO/examples/POA/Forwarding/MyFooServant.h
@@ -19,7 +19,7 @@
 #include "FooS.h"
 #include "Servant_Locator.h"
 
-class MyFirstFooServant : public POA_Foo, public ACE_Event_Handler
+class MyFirstFooServant : public POA_Foo
 {
   // = TITLE
   // @@ Michael, please comment me.
@@ -37,28 +37,19 @@ public:
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
   // Simple doit method
-  virtual CORBA::Long doit (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long doit (CORBA::Environment &env);
 
   // Setup forwarding
-  virtual void forward (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Foo::Cannot_Forward));
+  virtual void forward (CORBA::Environment &env);
 
-  virtual void shutdown (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (CORBA::Environment &env);
 
 protected:
-  int handle_input (ACE_HANDLE);
-
   // Default poa associated with this servant
-  CORBA::ORB_var orb_;
-  PortableServer::POA_var poa_;
+  CORBA::ORB_var orb_var_;
+  PortableServer::POA_var poa_var_;
   CORBA::Long value_;
   CORBA::Object_var forward_to_var_;
-
-  ACE_HANDLE handle_;
-  // Handle to dev null.
 };
 
 class MySecondFooServant : public POA_Foo
@@ -75,22 +66,19 @@ public:
   virtual ~MySecondFooServant (void);
 
   // Simple doit method
-  virtual CORBA::Long doit (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long doit (CORBA::Environment &env);
 
   // Setup forwarding
-  virtual void forward (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Foo::Cannot_Forward));
+  virtual void forward (CORBA::Environment &env);
 
-  virtual void shutdown (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (CORBA::Environment &env);
 
 protected:
   // Default poa associated with this servant
-  CORBA::ORB_var orb_;
+  CORBA::ORB_var orb_var_;
   MyFooServantLocator *locator_ptr_;
   CORBA::Long value_;
 };
 
 #endif /* MYFOOSERVANT_H */
+
diff --git a/TAO/examples/POA/Forwarding/README b/TAO/examples/POA/Forwarding/README
index 938f2a974f5..0acbf8615f6 100644
--- a/TAO/examples/POA/Forwarding/README
+++ b/TAO/examples/POA/Forwarding/README
@@ -13,12 +13,12 @@ Where every third request is a forwarding request to the object.
 
 Here's an example for 5 requests:
 
-first call (request no 1)
+first call (request no 1)  
 second call (request no 2)
 forwarding call (request no 3)
 thrid call (request no 4)
 fourth call (request no 5)
-(no six would be a forwarding call again)
+(no six would be a forwarding call again) 
 
 Two types of location forwardings are implemented: (1) the POA
 approach and (2) the servant locator approach.  Both are mentioned in
@@ -35,12 +35,12 @@ follows (basically just the switches are different):
 
 % server -p server2 -ORBobjrefstyle url
 % server -g server2 -p server1 -ORBobjrefstyle url
-% client -f server1 -i 5
+% client -g server1 -i 5
 
 For additional features try using the first server with the POA
 apporach and the second with the servant locator approach:
 
-% server -o server3 -ORBobjrefstyle url
+% server -o server3 -ORBobjrefstyle url  
 % server -g server3 -p server2 -ORBobjrefstyle url
 % server -f server2 -o server1 -ORBobjrefstyle url
 % client -f server1 -i 8
@@ -50,3 +50,6 @@ forwarding is called on this one and the next two calls are going to
 be called on the second one.  Location forwarding is then called on
 the second one and the last two calls are then done on the thrid
 server.
+
+
+
diff --git a/TAO/examples/POA/Forwarding/Servant_Locator.cpp b/TAO/examples/POA/Forwarding/Servant_Locator.cpp
index d5533779dc3..180cb15f302 100644
--- a/TAO/examples/POA/Forwarding/Servant_Locator.cpp
+++ b/TAO/examples/POA/Forwarding/Servant_Locator.cpp
@@ -42,14 +42,15 @@ MyFooServantLocator::~MyFooServantLocator ()
 PortableServer::Servant
 MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
                                 PortableServer::POA_ptr /* poa_ptr */,
-                                const char * /*operation*/,
+                                const char *operation,
                                 PortableServer::ServantLocator::Cookie & /* cookie */,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  //  ACE_UNUSED_ARG (operation);
+  ACE_UNUSED_ARG (operation);
 
   if (this->forwarding_ == 0) // do not forward
     {
+
       // Convert ObjectID to String.
 
       CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
@@ -83,9 +84,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
   else // now forward, in throwing the ForwardRequest Exception
   {
     // Throw forward exception
-    ACE_THROW_RETURN (PortableServer::ForwardRequest (
-                        CORBA::Object::_duplicate (this->forward_to_var_.in ())),
-                      0);
+    ACE_THROW_RETURN (PortableServer::ForwardRequest (), 0);
   }
 }
 
@@ -104,3 +103,4 @@ MyFooServantLocator::forward (CORBA::Environment &)
 {
   this->forwarding_ = 1;
 }
+
diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp
index b77c7f2b645..94bf8b5ffa1 100644
--- a/TAO/examples/POA/Forwarding/client.cpp
+++ b/TAO/examples/POA/Forwarding/client.cpp
@@ -33,20 +33,18 @@ read_ior (char *filename)
 {
   // Open the file for reading.
   ACE_HANDLE f_handle_ = ACE_OS::open (filename,0);
-
+  
   if (f_handle_ == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
 		       "Unable to open %s for reading: %p\n",
-		       filename,
-                       "ACE_OS::open"),
+		       filename),
 		      -1);
   ACE_Read_Buffer ior_buffer (f_handle_);
   server_IOR_ = ior_buffer.read ();
-
+  
   if (server_IOR_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to allocate memory to read ior: %p\n",
-                       "ACE_Read_Buffer::read"),
+                       "Unable to allocate memory to read ior: %p\n"),
                       -1);
   return 0;
 }
@@ -66,8 +64,7 @@ parse_args (int argc, char **argv)
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
 			     "Unable to read ior from %s : %p\n",
-			     get_opts.optarg,
-                             "read_ior"),
+			     get_opts.optarg),
 			    -1);
         break;
       case 'k':
@@ -85,81 +82,92 @@ parse_args (int argc, char **argv)
                            argv [0]),
                           -1);
       }
-
+  
   if (server_IOR_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Please specify the IOR for the servant\n"), -1);
-
+  
   // Indicates successful parsing of command line.
   return 0;
 }
 
-void
-do_calls (Foo_ptr foo_ptr,
-          CORBA::Environment &ACE_TRY_ENV)
+int do_calls (Foo_ptr foo_ptr)
 {
+  //  CORBA::Environment env;
+  ACE_DECLARE_NEW_CORBA_ENV;
+
+  CORBA::Long result = 0;
+  
   for (int i = 1; i <= iterations; i++)
     {
       // About half way through
       if (i % 3 == 0)
         {
           foo_ptr->forward (ACE_TRY_ENV);
-          ACE_CHECK;
+          ACE_CHECK_RETURN (-1);
         }
       else
         {
           // Invoke the doit() method of the foo reference.
-          CORBA::Long result = foo_ptr->doit (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          // Print the result of doit () method of the foo reference.
-          ACE_DEBUG ((LM_DEBUG,
-                      "doit() returned %d \n",
-                      result));
+          result = foo_ptr->doit (ACE_TRY_ENV);
+          // If exception
+          if (ACE_TRY_ENV.exception () != 0)
+          {
+            ACE_TRY_ENV.print_exception ("calling doit");
+          }
+          else
+            // Print the result of doit () method of the foo
+            // reference.
+            ACE_DEBUG ((LM_DEBUG,
+                        "doit() returned %d \n",
+                        result));
         }
     }
+
+  // In case you want to shutdown your server
+  // foo_ptr->shutdown (env);
+  // If exception
+  // if (env.exception () != 0)
+  // {
+  //   env.print_exception ("calling shutdown");
+  // }
+  return 0;
 }
 
 
 int
 main (int argc, char **argv)
 {
+  // @@ Michael, this function is too long.  Can you please break it
+  // up into multiple smaller functions.
+  //CORBA::Environment env;
   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;
-
-      // Initialize options based on command-line arguments.
-      int parse_args_result = parse_args (argc, argv);
-      if (parse_args_result != 0)
-        return parse_args_result;
-
-      // Get an object reference from the argument string.
-      CORBA::Object_var object = orb->string_to_object (server_IOR_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Try to narrow the object reference to a Foo reference.
-      Foo_var foo_var = Foo::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var original_location =
-        orb->object_to_string (foo_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      do_calls (foo_var.in (),
-                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      return -1;
-    }
-  ACE_ENDTRY;
+  // Initialize the ORB
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Initialize options based on command-line arguments.
+  int parse_args_result = parse_args (argc, argv);
+  if (parse_args_result != 0)
+    return parse_args_result;
+  
+  // Get an object reference from the argument string.
+  CORBA::Object_var object = orb->string_to_object (server_IOR_, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
+  // Try to narrow the object reference to a Foo reference.
+  Foo_var foo_var = Foo::_narrow (object.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+  
+  
+  CORBA::String_var original_location =
+    orb->object_to_string (foo_var.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  if (do_calls (foo_var.in()) == -1)
+    return -1;
+  
   return 0;
 }
+
diff --git a/TAO/examples/POA/Forwarding/run_test.pl b/TAO/examples/POA/Forwarding/run_test.pl
index ec597fc71a6..efcb22cad0a 100755
--- a/TAO/examples/POA/Forwarding/run_test.pl
+++ b/TAO/examples/POA/Forwarding/run_test.pl
@@ -78,63 +78,42 @@ sub run_test
     $SRV1 = Process::Create  (".".$DIR_SEPARATOR."server".$Process::EXE_EXT,
                              "$server1args");
     print STDERR ("server $server1args\n");
-
-    if (ACE::waitforfile_timed ("server1", 5) == -1) {
-      print STDERR "ERROR: cannot find file <server1> or <server2>\n";
-      $SRV1->Kill (); $SRV1->TimedWait (1);
-      exit 1;
-    }
+    ACE::waitforfile ("server1");
 
     $SRV2 = Process::Create  (".".$DIR_SEPARATOR."server".$Process::EXE_EXT,
                              "$server2args");
     print STDERR ("server $server2args\n");
+    ACE::waitforfile ("server2");
 
-    if (ACE::waitforfile_timed ("server2", 5) == -1) {
-      print STDERR "ERROR: cannot find file <server1> or <server2>\n";
-      $SRV1->Kill (); $SRV1->TimedWait (1);
-      $SRV2->Kill (); $SRV2->TimedWait (1);
-      exit 1;
-    }
-
-    if ($server3args ne "") {
-      $SRV3 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT,
-			       "$server3args");
-
-      if (ACE::waitforfile_timed ("server3", 5) == -1) {
-	print STDERR "ERROR: cannot find file <server3>\n";
-	$SRV1->Kill (); $SRV1->TimedWait (1);
-	$SRV2->Kill (); $SRV2->TimedWait (1);
-	$SRV3->Kill (); $SRV3->TimedWait (1);
-	exit 1;
-      }
+    if ($server3args ne "")
+    {
+        $SRV3 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT,
+                                 "$server3args");
+        ACE::waitforfile ("server3");
     }
 
     # Run the client and block until completion
-    $CL = Process::Create ($EXEPREFIX."client".$Process::EXE_EXT,
-			   " $clientargs");
-    print STDERR ("client $clientargs\n");
-
-    $client = $CL->TimedWait (60);
-    if ($client == -1) {
-      print STDERR "ERROR: client timedout\n";
-      $CL->Kill (); $CL->TimedWait (1);
-    }
+    $status  = system ("client$Process::EXE_EXT $clientargs");
+    print STDERR ("client $clientargs");
 
     # Now that the client has finished, kill off the servers
 
-    $SRV1->Kill (); $SRV1->TimedWait (1);
-    $SRV2->Kill (); $SRV2->TimedWait (1);
+    $SRV1->Kill (); $SRV1->Wait ();
+    $SRV2->Kill (); $SRV2->Wait ();
 
     if ($server3args ne "")
     {
-        $SRV3->Kill (); $SRV3->TimedWait (1);
+        $SRV3->Kill (); $SRV3->Wait ();
     }
 
-    if ($client != 0) {
-      print STDERR ("\n$brace Test of $testtype FAILED\n");
-      $status = -1;
-    } else {
-      print STDERR ("\n$brace Test of $testtype SUCCEEDED\n");
+    if ($status != 0)
+    {
+        print STDERR ("\n$brace Test of $testtype FAILED\n");
+        $status = -1;
+    }
+    else
+    {
+        print STDERR ("\n$brace Test of $testtype SUCCEEDED\n");
     }
     cleanup_ior ();
     return $status;
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp
index a41632a6d13..3a638d4d73c 100644
--- a/TAO/examples/POA/Forwarding/server.cpp
+++ b/TAO/examples/POA/Forwarding/server.cpp
@@ -38,12 +38,11 @@ read_ior (char *filename,
 {
   // Open the file for reading.
   ACE_HANDLE f_handle_ = ACE_OS::open (filename,0);
-
+  
   if (f_handle_ == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to open %s for writing: %p\n",
-                       filename,
-                       "ACE_OS::open"),
+                       filename),
                        -1);
 
   ACE_Read_Buffer ior_buffer (f_handle_);
@@ -54,9 +53,8 @@ read_ior (char *filename,
 
       if (first_foo_forward_to_IOR_ == 0)
 	ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to allocate memory to read ior: %p\n",
-                           "ACE_Read_Buffer::read"),
-			  -1);
+                           "Unable to allocate memory to read ior: %p\n"),
+			  -1);  
     }
   else if (foo_number == 2)
     {
@@ -64,19 +62,18 @@ read_ior (char *filename,
 
       if (second_foo_forward_to_IOR_ == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to allocate memory to read ior: %p\n",
-                           "ACE_Read_Buffer::read"),
+                           "Unable to allocate memory to read ior: %p\n"),
                           -1);
     }
-
+  
   if (foo_number == 1)
     ACE_DEBUG ((LM_DEBUG,
                 "POA approach: Read ior: %s\n",
-                first_foo_forward_to_IOR_));
+                first_foo_forward_to_IOR_));  
   else if (foo_number == 2)
     ACE_DEBUG ((LM_DEBUG,
                 "Locator approach: Read ior: %s\n",
-                second_foo_forward_to_IOR_));
+                second_foo_forward_to_IOR_));  
   return 0;
 }
 
@@ -86,8 +83,8 @@ parse_args (int argc, char **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "f:g:k:l:o:O:p:");
   int c;
-  int result;
-
+  int result; 
+  
   while ((c = get_opts ()) != -1)
     switch (c)
       {
@@ -96,8 +93,7 @@ parse_args (int argc, char **argv)
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
 			     "Unable to read ior from %s : %p\n",
-			     get_opts.optarg,
-                             "read_ior"),
+			     get_opts.optarg),
 			    -1);
         break;
       case 'g': // read the IOR from the file.
@@ -105,8 +101,7 @@ parse_args (int argc, char **argv)
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
 			     "Unable to read ior from %s : %p\n",
-			     get_opts.optarg,
-                             "read_ior"),
+			     get_opts.optarg),
 			    -1);
         break;
       case 'k':
@@ -120,22 +115,18 @@ parse_args (int argc, char **argv)
         if (first_foo_ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
-                             get_opts.optarg,
-                             "ACE_OS::fopen"),
-                            -1);
-        break;
+                             get_opts.optarg), -1);
+        break; 
       case 'p': // output the IOR to a file.
         second_foo_ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
         if (second_foo_ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
-                             get_opts.optarg,
-                             "ACE_OS::fopen"),
-                            -1);
-        break;
-      case 'O':
+                             get_opts.optarg), -1);
+        break; 
+      case 'O': 
         break;
-      case '?':
+      case '?':  
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "\nusage:  %s \n"
@@ -149,22 +140,27 @@ parse_args (int argc, char **argv)
                            argv [0]),
 			  -1);
       }
-
+  
   // Indicates successful parsing of command line.
   return 0;
 }
 
-static void
+static void 
 get_forward_reference (char *IOR,
                        CORBA::Object_var &forward_location_var,
                        CORBA::ORB_ptr orb_ptr,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &env)
 {
   if (IOR != 0)
     {
-      forward_location_var = orb_ptr->string_to_object (IOR, ACE_TRY_ENV);
-      ACE_CHECK;
-
+      forward_location_var = orb_ptr->string_to_object (IOR, env);
+            
+      if (env.exception () != 0)
+        {
+          env.print_exception ("ORB::string_to_object");
+          return;
+        }
+      
       if (CORBA::is_nil (forward_location_var.in ()))
         ACE_DEBUG ((LM_DEBUG,
                     "Error: Forward_to location is wrong\n"));
@@ -176,55 +172,47 @@ get_forward_reference (char *IOR,
 // use the POA directly to do forwarding
 
 int setup_first_poa (PortableServer::POA_ptr root_poa_ptr,
-                     PortableServer::POAManager_ptr poa_manager_ptr,
+                     PortableServer::POAManager_ptr poa_manager_ptr, 
                      PortableServer::POA_var &first_poa_var)
 {
-  //CORBA::Environment env;
-
-
+  CORBA::Environment env;
 
   // Policies for the childPOA to be created.
-  CORBA::PolicyList policies (2);
+  CORBA::PolicyList policies (2); 
   policies.length (2);
 
-  char str[256];
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  // The next two policies are common to both
+  
+  // Id Assignment Policy
+  policies[0] = root_poa_ptr->create_id_assignment_policy (PortableServer::USER_ID, env);
+  if (env.exception () != 0)
     {
-      // The next two policies are common to both
-
-      ACE_OS::strcpy (str, "PortableServer::POA::create_id_assignment_policy");
-      // Id Assignment Policy
-      policies[0] = root_poa_ptr->create_id_assignment_policy (PortableServer::USER_ID,
-                                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "PortableServer::POA::create_lifespan_policy");
-      // Lifespan policy
-      policies[1] = root_poa_ptr->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_CString name = "firstPOA";
-
-      ACE_OS::strcpy (str, "PortableServer::POA::create_POA");
-
-      // Create firstPOA as the child of RootPOA with the above policies
-      // firstPOA will use SERVANT_ACTIVATOR because of RETAIN policy.
-      first_poa_var = root_poa_ptr->create_POA (name.c_str (),
-                                                poa_manager_ptr,
-                                                policies,
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
+      return -1;
+    }
+  
+  // Lifespan policy
+  policies[1] = root_poa_ptr->create_lifespan_policy (PortableServer::PERSISTENT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_lifespan_policy");
+      return -1;
     }
-  ACE_CATCHANY
+
+    
+  ACE_CString name = "firstPOA";
+    
+  // Create firstPOA as the child of RootPOA with the above policies
+  // firstPOA will use SERVANT_ACTIVATOR because of RETAIN policy.
+  first_poa_var = root_poa_ptr->create_POA (name.c_str (),
+                                            poa_manager_ptr,
+                                            policies,
+                                            env);
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      env.print_exception ("PortableServer::POA::create_POA");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -234,324 +222,340 @@ int setup_first_poa (PortableServer::POA_ptr root_poa_ptr,
 // Servant_Locator to do forwarding
 
 int setup_second_poa (PortableServer::POA_ptr root_poa,
-                      PortableServer::POAManager_ptr poa_manager_ptr,
+                      PortableServer::POAManager_ptr poa_manager_ptr, 
                       PortableServer::POA_var &second_poa_var)
 {
-  //CORBA::Environment env;
+  CORBA::Environment env;
+
   // Policies for the childPOA to be created.
-  CORBA::PolicyList policies (4);
+  CORBA::PolicyList policies (4); 
   policies.length (4);
-  char str[256];
-  ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
+  // The next two policies are common to both
+  
+  // Id Assignment Policy
+  policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID, env);
+  if (env.exception () != 0)
     {
-
-      ACE_OS::strcpy (str, "PortableServer::POA::create_id_assignment_policy");
-
-      // The next two policies are common to both
-      // Id Assignment Policy
-      policies[0] = root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "PortableServer::POA::create_lifespan_policy");
-      // Lifespan policy
-      policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "PortableServer::POA::create_request_processing_policy");
-      // Tell the POA to use a servant manager
-      policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str,"PortableServer::POA::create_servant_retention_policy");
-
-      // Servant Retention Policy -> Use a locator
-      policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_CString name = "secondPOA";
-
-      ACE_OS::strcpy (str,"PortableServer::POA::create_POA");
-      // Create secondPOA as child of RootPOA with the above policies
-      // secondPOA will use a SERVANT_LOCATOR because of NON_RETAIN
-      // policy.
-      second_poa_var = root_poa->create_POA (name.c_str (),
-                                             poa_manager_ptr,
-                                             policies,
-                                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str,"PortableServer::POA::destroy");
-
-      // Creation of childPOAs is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < policies.length ();
-           ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
+      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
+      return -1;
+    }
+  
+  // Lifespan policy
+  policies[1] = root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_lifespan_policy");
+      return -1;
+    }
+        
+  // Tell the POA to use a servant manager
+  policies[2] =
+  root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER, env);
+  if (env.exception () != 0)
+    {
+	    env.print_exception ("PortableServer::POA::create_request_processing_policy");
+	    return -1;
+    }
+    
+  // Servant Retention Policy -> Use a locator
+  policies[3] =
+  root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN, env);
+  if (env.exception () != 0)
+    {
+	    env.print_exception ("PortableServer::POA::create_servant_retention_policy");
+	    return -1; 
     }
-  ACE_CATCHANY
+    
+  ACE_CString name = "secondPOA";
+    
+  // Create secondPOA as child of RootPOA with the above policies
+  // secondPOA will use a SERVANT_LOCATOR because of NON_RETAIN
+  // policy.
+  second_poa_var = root_poa->create_POA (name.c_str (),
+	                      			       poa_manager_ptr,
+				                             policies,
+				                             env);
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      env.print_exception ("PortableServer::POA::create_POA");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  
+  // Creation of childPOAs is over. Destroy the Policy objects.
+  for (CORBA::ULong i = 0;
+       i < policies.length () && env.exception () == 0;
+       ++i)
+    {
+      CORBA::Policy_ptr policy = policies[i];
+      policy->destroy (env);
+    }
 
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::destroy");
+      return -1;
+    }
   return 0;
 }
 
 int create_first_servant (PortableServer::POA_ptr first_poa_ptr,
                           CORBA::ORB_ptr orb_ptr)
 {
-  //CORBA::Environment env;
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  char str[256];
-
-  ACE_TRY
-    {
-      ACE_OS::strcpy (str, "get_forward_reference");
-      // Get the forward_to reference to feed it into object
-      // implementations
-      CORBA::Object_var first_foo_forward_to_var;
-
-      get_forward_reference (first_foo_forward_to_IOR_,
-                             first_foo_forward_to_var,
-                             orb_ptr,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      ACE_NEW_RETURN (myFirstFooServant_ptr,
-                      MyFirstFooServant (orb_ptr,
-                                         first_poa_ptr,
-                                           27,
-                                         first_foo_forward_to_var.in ()),
-                      -1);
-
-      // Create ObjectId and use that ObjectId to activate the
-      // first_foo_impl object.
-      PortableServer::ObjectId_var first_foo_oid_var =
-        PortableServer::string_to_ObjectId ("firstFoo");
-
-      ACE_OS::strcpy (str,"PortableServer::POA::activate_object_with_id");
+  CORBA::Environment env;
 
-      first_poa_ptr->activate_object_with_id (first_foo_oid_var.in (),
-                                              myFirstFooServant_ptr,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Get the forward_to reference to feed it into object
+  // implementations
+  CORBA::Object_var first_foo_forward_to_var;
 
-      ACE_OS::strcpy (str,"POA_Foo::_this");
+  get_forward_reference (first_foo_forward_to_IOR_,
+                         first_foo_forward_to_var,
+                         orb_ptr,
+                         env);
 
-      // Get Object reference for first_foo_impl object.
-      Foo_var first_foo_var = myFirstFooServant_ptr->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "CORBA::ORB::object_to_string");
-      // Stringyfy the object reference and print it out.
-      CORBA::String_var first_foo_ior_var =
-        orb_ptr->object_to_string (first_foo_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "POA approach: Own IOR: %s\n",
-                  first_foo_ior_var.in ()));
+  if (env.exception () != 0)
+    {
+      env.print_exception ("get_forward_reference");
+      return -1;
+    }
 
-      if (first_foo_ior_output_file_)
-        {
-          ACE_OS::fprintf (first_foo_ior_output_file_,
-                           "%s",
-                       first_foo_ior_var.in ());
-          ACE_OS::fclose (first_foo_ior_output_file_);
+  ACE_NEW_RETURN (myFirstFooServant_ptr, 
+                  MyFirstFooServant (orb_ptr,
+                                     first_poa_ptr, 
+                                     27,
+                                     first_foo_forward_to_var.in ()),
+                  -1);
+
+  // Create ObjectId and use that ObjectId to activate the
+  // first_foo_impl object.
+  PortableServer::ObjectId_var first_foo_oid_var =
+    PortableServer::string_to_ObjectId ("firstFoo");
+
+  first_poa_ptr->activate_object_with_id (first_foo_oid_var.in (),
+                                          myFirstFooServant_ptr,
+                                          env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::activate_object_with_id");
+      return -1;
+    }
+  
+  // Get Object reference for first_foo_impl object.
+  Foo_var first_foo_var = myFirstFooServant_ptr->_this (env);
 
-          ACE_DEBUG ((LM_DEBUG, "POA approach: Wrote IOR to a file.\n"));
-        }
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA_Foo::_this");
+      return -1;
     }
-  ACE_CATCHANY
+  
+  // Stringyfy the object reference and print it out.
+  CORBA::String_var first_foo_ior_var =
+    orb_ptr->object_to_string (first_foo_var.in (), env);
+  
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      env.print_exception ("CORBA::ORB::object_to_string");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  
+  ACE_DEBUG ((LM_DEBUG,
+              "POA approach: Own IOR: %s\n",
+              first_foo_ior_var.in ()));
+  
+  if (first_foo_ior_output_file_)
+    {
+      ACE_OS::fprintf (first_foo_ior_output_file_,
+                       "%s",
+                       first_foo_ior_var.in ());
+      ACE_OS::fclose (first_foo_ior_output_file_);
+      
+      ACE_DEBUG ((LM_DEBUG, "POA approach: Wrote IOR to a file.\n"));
+    }
   return 0;
 }
 
 
-int
+int 
 create_second_servant (PortableServer::POA_ptr second_poa_ptr,
                        CORBA::ORB_ptr orb_ptr)
 {
-  //  CORBA::Environment env;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  char str[256];
-  ACE_TRY
+  CORBA::Environment env;
+  
+  CORBA::Object_var second_foo_forward_to_var;
+  get_forward_reference (second_foo_forward_to_IOR_,
+                         second_foo_forward_to_var,
+                         orb_ptr,
+                         env);
+  if (env.exception () != 0)
     {
-      CORBA::Object_var second_foo_forward_to_var;
-
-      ACE_OS::strcpy (str, "get_forward_reference");
-
-      get_forward_reference (second_foo_forward_to_IOR_,
-                             second_foo_forward_to_var,
-                             orb_ptr,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // instantiate the servant locator and set it for the second child
-      // POA The locator gets to know where to forward to
-
-      ACE_NEW_RETURN (myFooServantLocator_ptr,
-                      MyFooServantLocator (orb_ptr,
-                                           second_foo_forward_to_var.in ()),
-                      -1);
-
-      ACE_OS::strcpy (str, "PortableServer::POAManager::_this");
-      PortableServer::ServantLocator_var servant_locator_var =
-        myFooServantLocator_ptr->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "PortableServer::POAManager::set_servant_manager");
-      // Set MyFooServantLocator object as the servant Manager of
-      // secondPOA.
-      second_poa_ptr->set_servant_manager (servant_locator_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      // Create the second MyFooServant
-      //            ======
-
-      // Try to create a reference with user created ID in second_poa
-      // which uses MyFooServantLocator.
-
-      PortableServer::ObjectId_var second_foo_oid_var =
-        PortableServer::string_to_ObjectId ("secondFoo");
-
-      ACE_OS::strcpy (str,"PortableServer::POA::create_reference_with_id");
-      CORBA::Object_var second_foo_var =
-        second_poa_ptr->create_reference_with_id (second_foo_oid_var.in (),
-                                                  "IDL:Foo:1.0", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str,"CORBA::ORB::object_to_string");
-      // Invoke object_to_string on the references created in firstPOA and
-      // secondPOA.
-      CORBA::String_var second_foo_ior_var =
-        orb_ptr->object_to_string (second_foo_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Locator approach: Own IOR: %s\n",
-                  second_foo_ior_var.in ()));
-
+      env.print_exception ("get_forward_reference");
+      return -1;
+    }
 
-      if (second_foo_ior_output_file_)
-        {
-          ACE_OS::fprintf (second_foo_ior_output_file_,
-                           "%s",
-                           second_foo_ior_var.in ());
-          ACE_OS::fclose (second_foo_ior_output_file_);
+  // instantiate the servant locator and set it for the second child
+  // POA The locator gets to know where to forward to
+  
+  ACE_NEW_RETURN (myFooServantLocator_ptr, 
+                  MyFooServantLocator (orb_ptr, 
+                                       second_foo_forward_to_var.in ()),
+                  -1);
+  PortableServer::ServantLocator_var servant_locator_var = 
+    myFooServantLocator_ptr->_this (env);
+  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::_this");
+      return -1;
+    }
+  
+  // Set MyFooServantLocator object as the servant Manager of
+  // secondPOA.
 
-          ACE_DEBUG ((LM_DEBUG, "Locator approach: Wrote IOR to a file.\n"));
-        }
+  second_poa_ptr->set_servant_manager (servant_locator_var.in (), env);
+  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::set_servant_manager");
+      return -1;
+    }
+  
+  // Create the second MyFooServant
+  //            ======
+  
+  // Try to create a reference with user created ID in second_poa
+  // which uses MyFooServantLocator.
+  
+  PortableServer::ObjectId_var second_foo_oid_var =
+    PortableServer::string_to_ObjectId ("secondFoo");
+  
+  CORBA::Object_var second_foo_var =
+    second_poa_ptr->create_reference_with_id (second_foo_oid_var.in (),
+                                          "IDL:Foo:1.0", env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_reference_with_id");
+      return -1;
     }
-  ACE_CATCHANY
+  
+  // Invoke object_to_string on the references created in firstPOA and
+  // secondPOA.
+
+  CORBA::String_var second_foo_ior_var = 
+    orb_ptr->object_to_string (second_foo_var.in (), env);
+  
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      env.print_exception ("CORBA::ORB::object_to_string");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  
+  ACE_DEBUG ((LM_DEBUG,
+              "Locator approach: Own IOR: %s\n",
+              second_foo_ior_var.in ()));
+  
+  
+  if (second_foo_ior_output_file_)
+    {
+      ACE_OS::fprintf (second_foo_ior_output_file_,
+                       "%s",
+                       second_foo_ior_var.in ());
+      ACE_OS::fclose (second_foo_ior_output_file_);
+
+      ACE_DEBUG ((LM_DEBUG, "Locator approach: Wrote IOR to a file.\n"));
+    }
+  
   return 0;
 }
 
 int
 main (int argc, char **argv)
 {
+  // @@ Michael, this function is WAY too long!  Can you please break
+  // it up into a number of subfunctions and put them into a class or
+  // something?!  It's impossible to tell what's going on here!
   int result = parse_args (argc, argv);
 
   if (result == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  char str[256];
-  ACE_TRY
+  CORBA::Environment env;
+  
+  // Initialize the ORB first.
+  CORBA::ORB_var orb_var = CORBA::ORB_init (argc, argv, 0, env);
+  
+  if (env.exception () != 0)
     {
-      ACE_OS::strcpy (str, "CORBA::ORB_init");
-      // Initialize the ORB first.
-      CORBA::ORB_var orb_var = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Obtain the RootPOA.
-      CORBA::Object_var obj_var = orb_var->resolve_initial_references ("RootPOA");
-
-      ACE_OS::strcpy (str,"PortableServer::POA::_narrow");
-      // Get the POA_var object from Object_var.
-      PortableServer::POA_var root_poa_var =
-        PortableServer::POA::_narrow (obj_var.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      // Get the POAManager of the RootPOA.
-      PortableServer::POAManager_var poa_manager_var =
-        root_poa_var->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      PortableServer::POA_var first_poa_var;
-      PortableServer::POA_var second_poa_var;
-
-      if (setup_first_poa (root_poa_var.in(), poa_manager_var.in(), first_poa_var) == -1)
-        return -1;
-      if (setup_second_poa (root_poa_var.in(), poa_manager_var.in(), second_poa_var) == -1)
-        return -1;
-
-      // Create the first MyFooServant
-      //            =====
-      if (create_first_servant (first_poa_var.in(), orb_var.in()) == -1)
-        return -1;
-
-      if (create_second_servant (second_poa_var.in(), orb_var.in()) == -1)
-        return -1;
-
-      ACE_OS::strcpy (str, "PortableServer::POAManager::activate");
-
-      poa_manager_var->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
 
-      if (orb_var->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "CORBA::ORB::run"),
-                          -1);
+  // Obtain the RootPOA.
+  CORBA::Object_var obj_var = orb_var->resolve_initial_references ("RootPOA");
+  
+  // Get the POA_var object from Object_var.
+  PortableServer::POA_var root_poa_var =
+    PortableServer::POA::_narrow (obj_var.in (), env);
+  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+  
+  // Get the POAManager of the RootPOA.
+  PortableServer::POAManager_var poa_manager_var =
+    root_poa_var->the_POAManager (env);
+  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::the_POAManager");
+      return -1;
+    }
+  
+  PortableServer::POA_var first_poa_var;
+  PortableServer::POA_var second_poa_var;
+
+  if (setup_first_poa (root_poa_var.in(), poa_manager_var.in(), first_poa_var) == -1)
+    return -1; 
+  if (setup_second_poa (root_poa_var.in(), poa_manager_var.in(), second_poa_var) == -1)
+    return -1;  
+    
+  // Create the first MyFooServant
+  //            =====
+  if (create_first_servant (first_poa_var.in(), orb_var.in()) == -1)
+    return -1;
 
-      ACE_OS::strcpy (str, "PortableServer::POA::destroy");
+  if (create_second_servant (second_poa_var.in(), orb_var.in()) == -1)
+    return -1;    
+  
+  poa_manager_var->activate (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::activate");
+      return -1;
+    }
+  
+  if (orb_var->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "CORBA::ORB::run"),
+                      -1);
 
-      // Destroy RootPOA. (Also destroys childPOA)
-      root_poa_var->destroy (1,
-                             1,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      delete myFirstFooServant_ptr;
-      delete myFooServantLocator_ptr;
+  
+  // Destroy RootPOA. (Also destroys childPOA)
+  root_poa_var->destroy (1,
+                         1,
+                         env);
+  delete myFirstFooServant_ptr;
+  delete myFooServantLocator_ptr;
 
-    }
-  ACE_CATCHANY
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      env.print_exception ("PortableServer::POA::destroy");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
+  
   return 0;
 }
diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile
index 2f4ec87b91f..ebbe48cd4e5 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile
+++ b/TAO/examples/POA/Generic_Servant/Makefile
@@ -42,7 +42,6 @@ VBIN = $(BIN:%=%$(VAR))
 LIBS = -lTAO
 LSRC = $(addsuffix .cpp,$(SHLIB_SRC))
 LOBJ = $(addsuffix .o,$(SHLIB_SRC))
-PSRC = $(addsuffix .cpp,$(BIN))
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -216,7 +215,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -236,25 +246,14 @@ 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/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/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 \
@@ -270,8 +269,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -310,7 +308,6 @@ realclean: clean
  $(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 \
@@ -470,7 +467,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -490,25 +498,14 @@ 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/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/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 \
@@ -524,8 +521,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -564,7 +560,6 @@ realclean: clean
  $(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 \
@@ -723,31 +718,8 @@ realclean: clean
  $(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 \
@@ -758,237 +730,6 @@ realclean: clean
  $(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 \
- generic_servant_export.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
-.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/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 \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.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 \
- $(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/Read_Buffer.i \
- FooC.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 \
- $(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 \
@@ -1008,25 +749,14 @@ 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/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/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 \
@@ -1042,8 +772,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1082,7 +811,6 @@ realclean: clean
  $(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 \
@@ -1094,6 +822,6 @@ 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_T.h FooS_T.i FooS_T.cpp FooS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
index afd347b97f8..f64e34d0030 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
@@ -43,21 +43,18 @@ MyFooServant::_default_POA (CORBA::Environment &/*env*/)
 
 CORBA::Long
 MyFooServant::doit (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
 MyFooServant::simply_doit (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 MyFooServant::timed_operation (CORBA::ULong timeout,
                                CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Thread %t starting  MyFooServant::timed_operation with timeout %d\n",
@@ -71,10 +68,8 @@ MyFooServant::timed_operation (CORBA::ULong timeout,
 
 void
 MyFooServant::shutdown (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0, ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.h b/TAO/examples/POA/Generic_Servant/MyFooServant.h
index 7f92aa0c7e8..8643f512562 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.h
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.h
@@ -32,21 +32,17 @@ public:
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
   // Returns the Default POA of this Servant object
 
-  virtual CORBA::Long doit (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long doit (CORBA::Environment &env);
   // Simple doit method
 
-  virtual void simply_doit (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void simply_doit (CORBA::Environment &env);
   // Even simpler doit method
 
   virtual void timed_operation (CORBA::ULong timeout,
-                                CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                CORBA::Environment &env);
   // Timed operation.
 
-  virtual void shutdown (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (CORBA::Environment &env);
   // Shutdown the ORB
 
 protected:
diff --git a/TAO/examples/POA/Identity/Identity.cpp b/TAO/examples/POA/Identity/Identity.cpp
index dba044d394d..1b3673abd0d 100644
--- a/TAO/examples/POA/Identity/Identity.cpp
+++ b/TAO/examples/POA/Identity/Identity.cpp
@@ -84,14 +84,12 @@ create_poas (PortableServer::POA_ptr root_poa,
                                      PortableServer::POAManager::_nil (),
                                      policies,
                                      ACE_TRY_ENV);
-  ACE_CHECK;
 
   policies[2]->destroy (ACE_TRY_ENV);
   ACE_CHECK;
 
   policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID,
                                                        ACE_TRY_ENV);
-  ACE_CHECK;
 
   // Creation of the thirdPOA
   name = "thirdPOA";
@@ -106,7 +104,6 @@ create_poas (PortableServer::POA_ptr root_poa,
 
   policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID,
                                                        ACE_TRY_ENV);
-  ACE_CHECK;
 
   // Creation of the forthPOA
   name = "forthPOA";
@@ -114,7 +111,6 @@ create_poas (PortableServer::POA_ptr root_poa,
                                     PortableServer::POAManager::_nil (),
                                     policies,
                                     ACE_TRY_ENV);
-  ACE_CHECK;
 
   // Creation of the new POAs over, so destroy the policies
   for (CORBA::ULong i = 0;
@@ -752,10 +748,8 @@ main (int argc, char **argv)
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "Exception!");
-      return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Identity/Makefile b/TAO/examples/POA/Identity/Makefile
index e0cb684d498..35d45779b2a 100644
--- a/TAO/examples/POA/Identity/Makefile
+++ b/TAO/examples/POA/Identity/Makefile
@@ -195,7 +195,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -215,25 +226,14 @@ 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/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/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 \
@@ -249,8 +249,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -289,7 +288,6 @@ realclean: clean
  $(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 \
@@ -448,7 +446,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -468,25 +477,14 @@ 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/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/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 \
@@ -502,8 +500,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -542,7 +539,6 @@ realclean: clean
  $(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 \
@@ -701,7 +697,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -721,25 +728,14 @@ 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/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/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 \
@@ -755,8 +751,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -795,7 +790,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/POA/Identity/svc.conf b/TAO/examples/POA/Identity/svc.conf
index 21b46f90b5d..f58fc4ea337 100644
--- a/TAO/examples/POA/Identity/svc.conf
+++ b/TAO/examples/POA/Identity/svc.conf
@@ -3,4 +3,4 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Server_Strategy_Factory "-ORBUseridPolicyDemuxStrategy dynamic -ORBSystemidPolicyDemuxStrategy active -ORBUniqueidPolicyReverseDemuxStrategy dynamic -ORBAllowReactivationOfSystemids 1 -ORBActiveHintInIds 1"
+static Server_Strategy_Factory "-ORBuseridpolicydemuxstrategy dynamic -ORBsystemidpolicydemuxstrategy active -ORBuniqueidpolicyreversedemuxstrategy dynamic -ORBallowreactivationofsystemids 1 -ORBactivehintinids 1"
diff --git a/TAO/examples/POA/Loader/Makefile b/TAO/examples/POA/Loader/Makefile
index 427a4bb9f6a..cd65c6d5720 100644
--- a/TAO/examples/POA/Loader/Makefile
+++ b/TAO/examples/POA/Loader/Makefile
@@ -190,7 +190,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -210,25 +221,14 @@ 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 \
- $(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/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 \
@@ -244,8 +244,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -284,7 +283,6 @@ endif
  $(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 \
@@ -446,7 +444,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -466,25 +475,14 @@ 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 \
- $(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/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 \
@@ -500,8 +498,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -540,7 +537,6 @@ endif
  $(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 \
@@ -699,7 +695,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -719,25 +726,14 @@ 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 \
- $(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/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 \
@@ -753,8 +749,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -793,7 +788,6 @@ endif
  $(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 \
@@ -953,7 +947,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -973,25 +978,14 @@ 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 \
- $(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/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 \
@@ -1007,8 +1001,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1047,7 +1040,6 @@ endif
  $(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 \
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index aced224e8de..db831d7a92e 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -38,23 +38,17 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb,
                  "%p\n",
                  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);
 
+  // Obtain the symbol for the function that will
+  // get the servant object.
   servant_supplier_ =
-    ACE_reinterpret_cast (SERVANT_FACTORY, function);
+    (SERVANT_FACTORY) this->dll_.symbol (factory_function);
 
-  // Obtain tne symbol for the function which will destroy the
-  // servant.
-  symbol = this->dll_.symbol (garbage_collection_function);
-  function = ACE_reinterpret_cast (long, symbol);
+  // 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/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index b901c6a8344..362b45423b0 100755
--- a/TAO/examples/POA/Loader/run_test.pl
+++ b/TAO/examples/POA/Loader/run_test.pl
@@ -59,48 +59,15 @@ unlink $iorfile_2;
 
 $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
 
-if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-
-$CL_1  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			 " $extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_2 -x");
-
+ACE::waitforfile ($iorfile_1);
+ACE::waitforfile ($iorfile_2);
 
-$client_1 = $CL_1->TimedWait (60);
-if ($client_1 == -1) {
-  print STDERR "ERROR: client 1 timedout\n";
-  $CL_1->Kill (); $CL_1->TimedWait (1);
-}
-
-$client_2 = $CL_2->TimedWait (60);
-if ($client_2 == -1){
-  print STDERR "ERROR: client 2 timedout\n";
-  $CL_2->Kill (); $CL_2->TimedWait (1);
-}
-
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2 -x");
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-if ($server !=0 || $client_1 != 0 || $client_2 != 0) {
-  exit 1;
-}
+$SV->Wait ();
 
-exit 0;
+exit $status;
diff --git a/TAO/examples/POA/NewPOA/Makefile b/TAO/examples/POA/NewPOA/Makefile
index b79527652d5..be939dcf099 100644
--- a/TAO/examples/POA/NewPOA/Makefile
+++ b/TAO/examples/POA/NewPOA/Makefile
@@ -186,7 +186,18 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -206,25 +217,14 @@ 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 \
- $(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/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 \
@@ -240,8 +240,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -280,7 +279,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 \
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index 9e383d185bb..8a52461c054 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -29,117 +29,109 @@ int
 main (int argc, char **argv)
 {
   //  CORBA::Environment env;
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
-  ACE_TRY
-    {
-      // The first step Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-                                            argv, 
-                                            0, 
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // The first step Initialize the ORB
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 
+                                        argv, 
+                                        0, 
+                                        ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
   
-      // Obtain the object reference to the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA");
-
-      // _narrow() the Object to get the POA object, i.e., the root_poa.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // 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);
-      ACE_TRY_CHECK;
-
-      // Lifespan policy
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::TRANSIENT, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Creation of the firstPOA
-      ACE_CString name = "firstPOA";
-      PortableServer::POA_var first_poa =
-        root_poa->create_POA (name.c_str (),
-                              PortableServer::POAManager::_nil (),
-                              policies,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Creation of the new POA, i.e. firstPOA/secondPOA
-      name = "secondPOA";
-      PortableServer::POA_var second_poa =
-        first_poa->create_POA (name.c_str (),
-                               PortableServer::POAManager::_nil (),
-                               policies,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Creating thirdPOA.
-      name = "thirdPOA";
-
-      PortableServer::POA_var third_poa =
-        root_poa->create_POA (name.c_str (),
-                              PortableServer::POAManager::_nil (),
-                              policies,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Creation of the new POAs over, so destroy the Policy_ptr's.
-      for (CORBA::ULong i = 0;
-           i < policies.length () && ACE_TRY_ENV.exception () == 0;
-           ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      // Get the names of all the POAs and print them out.
-
-      CORBA::String_var root_poa_name =
-        root_poa->the_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var first_poa_name =
-        first_poa->the_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var second_poa_name =
-        second_poa->the_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      CORBA::String_var third_poa_name =
-        third_poa->the_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s\n%s\n%s\n%s\n",
-                  root_poa_name.in (),
-                  first_poa_name.in (),
-                  second_poa_name.in (),
-                  third_poa_name.in ()));
-
-      // This should destroy all its children
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
+  // Obtain the object reference to the RootPOA.
+  CORBA::Object_var obj =
+    orb->resolve_initial_references ("RootPOA");
+
+  // _narrow() the Object to get the POA object, i.e., the root_poa.
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // 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);
+  ACE_CHECK_RETURN (-1);
+
+  // Lifespan policy
+  policies[1] =
+    root_poa->create_lifespan_policy (PortableServer::TRANSIENT, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Creation of the firstPOA
+  ACE_CString name = "firstPOA";
+  PortableServer::POA_var first_poa =
+    root_poa->create_POA (name.c_str (),
+                          PortableServer::POAManager::_nil (),
+                          policies,
+                          ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Creation of the new POA, i.e. firstPOA/secondPOA
+  name = "secondPOA";
+  PortableServer::POA_var second_poa =
+    first_poa->create_POA (name.c_str (),
+                           PortableServer::POAManager::_nil (),
+                           policies,
+                           ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Creating thirdPOA.
+  name = "thirdPOA";
+
+  PortableServer::POA_var third_poa =
+    root_poa->create_POA (name.c_str (),
+                          PortableServer::POAManager::_nil (),
+                          policies,
+                          ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Creation of the new POAs over, so destroy the Policy_ptr's.
+  for (CORBA::ULong i = 0;
+       i < policies.length () && ACE_TRY_ENV.exception () == 0;
+       ++i)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main ");
-      return -1;
+      CORBA::Policy_ptr policy = policies[i];
+      policy->destroy (ACE_TRY_ENV);
     }
-  ACE_ENDTRY;
+
   ACE_CHECK_RETURN (-1);
-  
+
+  // Get the names of all the POAs and print them out.
+
+  CORBA::String_var root_poa_name =
+    root_poa->the_name (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  CORBA::String_var first_poa_name =
+    first_poa->the_name (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  CORBA::String_var second_poa_name =
+    second_poa->the_name (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+
+  CORBA::String_var third_poa_name =
+    third_poa->the_name (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  ACE_DEBUG ((LM_DEBUG,
+              "%s\n%s\n%s\n%s\n",
+              root_poa_name.in (),
+              first_poa_name.in (),
+              second_poa_name.in (),
+              third_poa_name.in ()));
+
+  // This should destroy all its children
+  root_poa->destroy (1,
+                     1,
+                     ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
   return 0;
 }
diff --git a/TAO/examples/POA/NewPOA/run_test.pl b/TAO/examples/POA/NewPOA/run_test.pl
index a40bd3ec88a..58004c58b48 100755
--- a/TAO/examples/POA/NewPOA/run_test.pl
+++ b/TAO/examples/POA/NewPOA/run_test.pl
@@ -8,10 +8,5 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 unshift @INC, '../../../../bin';
 require ACEutils;
 
-$TEST  = Process::Create ($EXEPREFIX."NewPOA$Process::EXE_EXT", "");
-if ($TEST->TimedWait (60) == -1) {
-  print STDERR "ERROR: test timedout\n";
-  $TEST->Kill (); $TEST->TimedWait (1);
-  exit 1;
-}
-exit 0;
+$status  = system ($EXEPREFIX."NewPOA$Process::EXE_EXT");
+exit $status;
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile b/TAO/examples/POA/On_Demand_Activation/Makefile
index 0a8131d4d06..b8088fb7fb6 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile
@@ -189,7 +189,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -209,25 +220,14 @@ 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 \
- $(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/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 \
@@ -243,8 +243,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -283,7 +282,6 @@ endif
  $(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 \
@@ -446,7 +444,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -466,25 +475,14 @@ 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 \
- $(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/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 \
@@ -500,8 +498,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -540,7 +537,6 @@ endif
  $(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 \
@@ -706,7 +702,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -726,25 +733,14 @@ 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 \
- $(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/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 \
@@ -760,8 +756,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -800,7 +795,6 @@ endif
  $(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 \
diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl
index 6a84c82e153..362b45423b0 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -59,48 +59,15 @@ unlink $iorfile_2;
 
 $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
 
-if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-$CL_1  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  "$extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  "$extra_args $oneway -i $iterations -f $iorfile_2 -x");
-
-
-$client_1 = $CL_1->TimedWait (60);
-if ($client_1 == -1) {
-  print STDERR "ERROR: client 1 timedout\n";
-  $CL_1->Kill (); $CL_1->TimedWait (1);
-}
-$client_2 = $CL_2->TimedWait (60);
-if ($client_2 == -1) {
-  print STDERR "ERROR: client 2 timedout\n";
-  $CL_2->Kill (); $CL_2->TimedWait (1);
-}
-
+ACE::waitforfile ($iorfile_1);
+ACE::waitforfile ($iorfile_2);
 
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2 -x");
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-if ($server != 0 || $client_1 != 0 || $client_2 != 0){
-  exit 1;
-}
-
-exit 0;
+$SV->Wait ();
 
+exit $status;
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index 5b0409cd135..94baef307ce 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -65,36 +65,36 @@ write_iors_to_file (const char *first_ior,
 
   FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "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",
+    ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s\n", 
                        ior_output_file_1,
-                       ior_output_file_2),
+                       ior_output_file_2), 
                       -1);
 
   int result = ACE_OS::fprintf (output_file_1,
-				"%s",
+				"%s", 
 				first_ior);
   if (result <= 0
       || ACE_static_cast(size_t,result) != ACE_OS::strlen (first_ior))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_OS::fprintf failed while writing %s to %s\n",
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       "ACE_OS::fprintf failed while writing %s to %s\n", 
                        first_ior,
                        ior_output_file_1),
                       -1);
-
+  
   result = ACE_OS::fprintf (output_file_2,
-                            "%s",
+                            "%s", 
                             second_ior);
   if (result <= 0
       || ACE_static_cast(size_t,result) != ACE_OS::strlen (second_ior))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_OS::fprintf failed while writing %s to %s\n",
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       "ACE_OS::fprintf failed while writing %s to %s\n", 
                        second_ior,
                        ior_output_file_2),
                       -1);
-
+  
   ACE_OS::fclose (output_file_1);
   ACE_OS::fclose (output_file_2);
 
@@ -104,192 +104,184 @@ write_iors_to_file (const char *first_ior,
 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;
-
-      int result = parse_args (argc, argv);
-      if (result != 0)
-        return result;
-
-      // Get an Object reference to RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA");
-
-      // Narrow the Object reference to a POA reference
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the POAManager of RootPOA
+  //  CORBA::Environment env;
 
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      CORBA::PolicyList policies (4);
-      policies.length (4);
-
-      // ID Assignment Policy
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Lifespan Policy
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Request Processing Policy
-      policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var first_poa;
-      {
-        // Servant Retention Policy
-        policies[3] =
-          root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
-        ACE_CString name = "firstPOA";
+  // Initialize the ORB.
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-        // Create firstPOA as the child of RootPOA with the above policies
-        // firstPOA will use SERVANT_ACTIVATOR because of RETAIN policy.
-        first_poa = root_poa->create_POA (name.c_str (),
-                                          poa_manager.in (),
-                                          policies,
-                                          ACE_TRY_ENV);
-        ACE_TRY_CHECK;
+  int result = parse_args (argc, argv);
+  if (result != 0)
+    return result;
+  
+  // Get an Object reference to RootPOA.
+  CORBA::Object_var obj =
+    orb->resolve_initial_references ("RootPOA");
+
+  // Narrow the Object reference to a POA reference
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      }
+  // Get the POAManager of RootPOA
 
-      PortableServer::POA_var second_poa;
-      {
-        // Servant Retention Policy
-        policies[3] =
-          root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-
-        ACE_CString name = "secondPOA";
-
-        // Create secondPOA as child of RootPOA with the above policies
-        // secondPOA will use a SERVANT_LOCATOR because of NON_RETAIN
-        // policy.
-        second_poa = root_poa->create_POA (name.c_str (),
-                                           poa_manager.in (),
-                                           policies,
-                                           ACE_TRY_ENV);
-        ACE_TRY_CHECK;
+  PortableServer::POAManager_var poa_manager =
+    root_poa->the_POAManager (ACE_TRY_ENV);
 
-      }
+  ACE_CHECK_RETURN (-1);
 
-      // Destroy the policy objects as they have been passed to
-      // create_POA and no longer needed.
-      for (CORBA::ULong i = 0;
-           i < policies.length () && ACE_TRY_ENV.exception () == 0;
-           ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
+  CORBA::PolicyList policies (4);
+  policies.length (4);
 
+    // ID Assignment Policy
+  policies[0] =
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+ 
+  // Lifespan Policy
+  policies[1] =
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      MyFooServantActivator servant_activator_impl (orb.in ());
-      PortableServer::ServantActivator_var servant_activator =
-        servant_activator_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Request Processing Policy
+  policies[2] =
+    root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      // Set MyFooServantActivator object as the servant_manager of
-      // firstPOA.
+  PortableServer::POA_var first_poa;
+  {
+    // Servant Retention Policy
+    policies[3] =
+      root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
+    ACE_CHECK_RETURN (-1);
+
+    ACE_CString name = "firstPOA";
+
+    // Create firstPOA as the child of RootPOA with the above policies
+    // firstPOA will use SERVANT_ACTIVATOR because of RETAIN policy.
+    first_poa = root_poa->create_POA (name.c_str (),
+                                      poa_manager.in (),
+                                      policies,
+                                      ACE_TRY_ENV);
+    ACE_CHECK_RETURN (-1);
+
+  }
+
+  PortableServer::POA_var second_poa;
+  {
+    // Servant Retention Policy
+    policies[3] =
+      root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN, ACE_TRY_ENV);
+    ACE_CHECK_RETURN (-1);
+
+    ACE_CString name = "secondPOA";
+
+    // Create secondPOA as child of RootPOA with the above policies
+    // secondPOA will use a SERVANT_LOCATOR because of NON_RETAIN
+    // policy.
+    second_poa = root_poa->create_POA (name.c_str (),
+                                      poa_manager.in (),
+                                      policies,
+                                      ACE_TRY_ENV);
+    ACE_CHECK_RETURN (-1);
+
+  }
+
+  // Destroy the policy objects as they have been passed to
+  // create_POA and no longer needed.
+  for (CORBA::ULong i = 0;
+       i < policies.length () && ACE_TRY_ENV.exception () == 0;
+       ++i)
+    {
+      CORBA::Policy_ptr policy = policies[i];
+      policy->destroy (ACE_TRY_ENV);
+    }
+  ACE_CHECK_RETURN (-1);
 
-      first_poa->set_servant_manager (servant_activator.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  MyFooServantActivator servant_activator_impl (orb.in ());
+  PortableServer::ServantActivator_var servant_activator =
+    servant_activator_impl._this (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      // Create a reference with user created ID in firstPOA which uses
-      // the MyFooServantActivator.
+  // Set MyFooServantActivator object as the servant_manager of
+  // firstPOA.
 
-      PortableServer::ObjectId_var first_foo_oid =
-        PortableServer::string_to_ObjectId ("firstFoo");
+  first_poa->set_servant_manager (servant_activator.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      CORBA::Object_var first_foo =
-        first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Create a reference with user created ID in firstPOA which uses
+  // the MyFooServantActivator.
 
+  PortableServer::ObjectId_var first_foo_oid =
+    PortableServer::string_to_ObjectId ("firstFoo");
 
-      MyFooServantLocator servant_locator_impl (orb.in ());
-      PortableServer::ServantLocator_var servant_locator =
-        servant_locator_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  CORBA::Object_var first_foo =
+    first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0", ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
+  
+  MyFooServantLocator servant_locator_impl (orb.in ());
+  PortableServer::ServantLocator_var servant_locator =
+    servant_locator_impl._this (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      // Set MyFooServantLocator object as the servant Manager of
-      // secondPOA.
-      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.
+  // Set MyFooServantLocator object as the servant Manager of
+  // secondPOA.
+  second_poa->set_servant_manager (servant_locator.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      PortableServer::ObjectId_var second_foo_oid =
-        PortableServer::string_to_ObjectId ("secondFoo");
+  // Try to create a reference with user created ID in second_poa
+  // which uses MyFooServantLocator.
 
-      CORBA::Object_var second_foo =
-        second_poa->create_reference_with_id (second_foo_oid.in (),
-                                              "IDL:Foo:1.0", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  PortableServer::ObjectId_var second_foo_oid =
+    PortableServer::string_to_ObjectId ("secondFoo");
 
-      // Invoke object_to_string on the references created in firstPOA and
-      // secondPOA.
+  CORBA::Object_var second_foo =
+    second_poa->create_reference_with_id (second_foo_oid.in (),
+                                          "IDL:Foo:1.0", ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      CORBA::String_var first_foo_ior =
-        orb->object_to_string (first_foo.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Invoke object_to_string on the references created in firstPOA and
+  // secondPOA.
 
+  CORBA::String_var first_foo_ior = 
+    orb->object_to_string (first_foo.in (), ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      CORBA::String_var second_foo_ior =
-        orb->object_to_string (second_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_CHECK_RETURN (-1);
 
-      // Print the ior's of first_foo and second_foo.
+  // 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 ()));
+  ACE_DEBUG((LM_DEBUG,"%s\n%s\n",
+	     first_foo_ior.in (),
+	     second_foo_ior.in ()));
 
-      int write_result = write_iors_to_file (first_foo_ior.in (),
-                                             second_foo_ior.in ());
-      if (write_result != 0)
-        return write_result;
+  int write_result = write_iors_to_file (first_foo_ior.in (),
+                                         second_foo_ior.in ());
+  if (write_result != 0)
+    return write_result;
 
-      // Set the poa_manager state to active, ready to process requests.
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Set the poa_manager state to active, ready to process requests.
+  poa_manager->activate (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
-      // Run the ORB.
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+  // 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
+  // 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_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in main");
-      return -1;
-    }
-  ACE_ENDTRY;
+  root_poa->destroy (1,
+                     1,
+                     ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
+
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile
index ab0b4ef1664..4898183a2a7 100644
--- a/TAO/examples/POA/On_Demand_Loading/Makefile
+++ b/TAO/examples/POA/On_Demand_Loading/Makefile
@@ -194,7 +194,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -214,25 +225,14 @@ 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 \
- $(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/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 \
@@ -248,8 +248,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -288,7 +287,6 @@ endif
  $(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 \
@@ -450,7 +448,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -470,25 +479,14 @@ 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 \
- $(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/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 \
@@ -504,8 +502,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -544,7 +541,6 @@ endif
  $(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 \
@@ -704,7 +700,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -724,25 +731,14 @@ 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 \
- $(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/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 \
@@ -758,8 +754,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -798,7 +793,6 @@ endif
  $(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 \
@@ -956,7 +950,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -976,25 +981,14 @@ 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 \
- $(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/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 \
@@ -1010,8 +1004,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1050,7 +1043,6 @@ endif
  $(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 \
@@ -1212,7 +1204,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1232,25 +1235,14 @@ 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 \
- $(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/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 \
@@ -1266,8 +1258,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1306,7 +1297,6 @@ endif
  $(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 \
diff --git a/TAO/examples/POA/On_Demand_Loading/README b/TAO/examples/POA/On_Demand_Loading/README
index 1e54111f6f9..c4b471ad96f 100644
--- a/TAO/examples/POA/On_Demand_Loading/README
+++ b/TAO/examples/POA/On_Demand_Loading/README
@@ -50,8 +50,3 @@ example:
 The output will demonstrate the different actions performed by the
 Servant_Manager via the Servant_Activator and the Servant_Locator
 interfaces.
-
-NOTE: If directly running run_test.pl srcipt then by default the example
-uses Generic_Servant as the servant. Hence its necessary to build
-$TAO_ROOT/examples/POA/Generic_Servant before you build and run this 
-example.
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
index 5588e5f055c..3ffa8a7881e 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -21,9 +21,9 @@
 
 ACE_RCSID(On_Demand_Activation, Servant_Manager, "$Id$")
 
-  // Initialization.
-  ServantManager_i::ServantManager_i (CORBA::ORB_ptr orb)
-    : orb_ (CORBA::ORB::_duplicate (orb))
+// Initialization.
+ServantManager_i::ServantManager_i (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
@@ -54,36 +54,30 @@ ServantManager_i::obtain_servant (const char *str,
 
   // Obtain the ObjectId from the string argument.
 
-  PortableServer::ObjectId_var oid =
-    PortableServer::string_to_ObjectId (str);
+   PortableServer::ObjectId_var oid =
+     PortableServer::string_to_ObjectId (str);
 
-  ACE_DEBUG ((LM_DEBUG,
-              "before bind\n"));
+   ACE_DEBUG ((LM_DEBUG,
+               "before bind\n"));
   // Make an HASH_MAP entry by binding the object_id and the DLL
   // object associated with it together.
-  if (this->servant_map_.bind (oid.in (),
-                               dll) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "Bind failed"),
-                      0);
-  // Now that the dll name is available we open the dll.
-  if (dll->open (dllname_.c_str ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p",
-                       dll->error ()),
-                      0);
-
-  // The next step is to obtain the symbol for the function that will
+   if (this->servant_map_.bind (oid.in (),
+                                dll) == -1)
+     ACE_ERROR_RETURN ((LM_ERROR,
+                        "%p\n",
+                        "Bind failed"),
+                       0);
+   // Now that the dll name is available we open the dll.
+   if (dll->open (dllname_.c_str ()) == -1)
+     ACE_ERROR_RETURN ((LM_ERROR,
+                        "%p",
+                        dll->error ()),
+                       0);
+
+   // The next step is to obtain the symbol for the function that will
   // create the servant object and return it.
-
-  // Cannot go from void* to function pointer directly. Cast the void*
-  // to long first.
-  void *symbol = dll->symbol (create_symbol_.c_str ());
-  long function = ACE_reinterpret_cast (long, symbol);
-
   SERVANT_FACTORY servant_creator =
-    ACE_reinterpret_cast (SERVANT_FACTORY, function);
+    (SERVANT_FACTORY) dll->symbol (create_symbol_.c_str ());
 
   // Checking whether it is possible to create the servant.
   if (servant_creator == 0)
@@ -91,7 +85,6 @@ ServantManager_i::obtain_servant (const char *str,
                        "%p",
                        dll->error ()),
                       0);
-
   // Now create and return the servant using the <servant_creator>
   // factory function.
   return (*servant_creator) (this->orb_.in (),
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index 5adb40ceab2..71eb22f9d5b 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -129,7 +129,7 @@ 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_CHECK;
+      ;
   
       // Get the POAManager of RootPOA
       poa_manager_ = root_poa_->the_POAManager (ACE_TRY_ENV);
@@ -188,7 +188,6 @@ Server_i::create_poa (const char *name,
         root_poa_->create_servant_retention_policy 
         (PortableServer::RETAIN,
          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
       
       if (servant_retention_policy == 0)
       policies_[3] =
@@ -210,12 +209,11 @@ Server_i::create_poa (const char *name,
       // 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 
@@ -224,7 +222,6 @@ Server_i::create_poa (const char *name,
       return 0;
     }
   ACE_ENDTRY;  
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return my_poa;
 }
@@ -384,7 +381,7 @@ Server_i::run (void)
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  
   return 0;
 }
 
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index 08f9d16e7b7..362b45423b0 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -59,49 +59,15 @@ unlink $iorfile_2;
 
 $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
 
-if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
+ACE::waitforfile ($iorfile_1);
+ACE::waitforfile ($iorfile_2);
 
-
-$CL_1  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_1");
-$CL_2  = Process::Create ("../Generic_Servant/client$Process::EXE_EXT ",
-			  " $extra_args $oneway -i $iterations -f $iorfile_2 -x");
-
-$client_1 = $CL_1->TimedWait (60);
-if ($client_1 == -1) {
-  print STDERR "ERROR: client 1 timedout\n";
-  $CL_1->Kill (); $CL_1->TimedWait (1);
-}
-
-$client_2 = $CL_2->TimedWait (60);
-if ($client_2 == -1) {
-  print STDERR "ERROR: client 2 timedout\n";
-  $CL_2->Kill (); $CL_2->TimedWait (1);
-}
-
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2 -x");
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-if ($server != 0 || $client_1 != 0 || $client_2 != 0) {
-  exit 1;
-}
-
-exit 0;
+$SV->Wait ();
 
+exit $status;
diff --git a/TAO/examples/POA/On_Demand_Loading/svc.conf b/TAO/examples/POA/On_Demand_Loading/svc.conf
index 640281c0e64..a5a704c4cdc 100644
--- a/TAO/examples/POA/On_Demand_Loading/svc.conf
+++ b/TAO/examples/POA/On_Demand_Loading/svc.conf
@@ -1,4 +1,5 @@
 # $Id$
 #
-
-static Server_Strategy_Factory "-ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+static Resource_Factory "-ORBresources global"
+static Client_Strategy_Factory ""
+static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile b/TAO/examples/POA/Reference_Counted_Servant/Makefile
index 91b72f0fa70..0bad8ab3d84 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile
+++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile
@@ -191,7 +191,18 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -211,25 +222,14 @@ 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 \
- $(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/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 \
@@ -245,8 +245,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -285,7 +284,6 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
  $(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 \
diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
index 15ff238f4c9..ef98b4aae46 100755
--- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
+++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
@@ -55,31 +55,12 @@ unlink $iorfile;
 
 $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
 
-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 ("../Generic_Servant/client$Process::EXE_EXT ",
-			" $extra_args $oneway -i $iterations -f $iorfile -x");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
+ACE::waitforfile ($iorfile);
 
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile -x");
 
 unlink $iorfile;
 
-if ($server != 0 || $client != 0){
-  exit 1;
-}
+$SV->Wait ();
 
-exit 0;
+exit $status;
diff --git a/TAO/examples/POA/RootPOA/Makefile b/TAO/examples/POA/RootPOA/Makefile
index 94d4260a5ee..8a1f2c04dd6 100644
--- a/TAO/examples/POA/RootPOA/Makefile
+++ b/TAO/examples/POA/RootPOA/Makefile
@@ -185,7 +185,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -205,25 +216,14 @@ 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 \
- $(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/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 \
@@ -239,8 +239,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -279,7 +278,6 @@ endif
  $(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 \
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index 53730bb4bab..a7a3538466a 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -25,11 +25,9 @@ ACE_RCSID(RootPOA, RootPOA, "$Id$")
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  // Initilize the ORB
+  ACE_TRY_NEW_ENV
     {
-      // Initilize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
diff --git a/TAO/examples/POA/TIE/Foo_i.cpp b/TAO/examples/POA/TIE/Foo_i.cpp
index 5f8b8e67cb1..203ac3aa1a7 100644
--- a/TAO/examples/POA/TIE/Foo_i.cpp
+++ b/TAO/examples/POA/TIE/Foo_i.cpp
@@ -27,7 +27,6 @@ ACE_RCSID(TIE, Foo_i, "$Id$")
 // Return this->value
 CORBA::Long
 Tie_i::doit (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
@@ -43,7 +42,6 @@ A_i::A_i (CORBA::Long value,
 // Return this->value
 CORBA::Long
 A_i::doit (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
@@ -66,7 +64,6 @@ Outer_i::B_i::B_i (CORBA::Long value,
 // Return this->value
 CORBA::Long
 Outer_i::B_i::doit (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
@@ -89,7 +86,6 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value,
 // Return this->value
 CORBA::Long
 Outer_i::Inner_i::C_i::doit (CORBA::Environment &/*env*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
@@ -100,3 +96,4 @@ Outer_i::Inner_i::C_i::_default_POA (CORBA::Environment &/*env*/)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
+
diff --git a/TAO/examples/POA/TIE/Foo_i.h b/TAO/examples/POA/TIE/Foo_i.h
index fdf7fce2ab6..116e5384ca6 100644
--- a/TAO/examples/POA/TIE/Foo_i.h
+++ b/TAO/examples/POA/TIE/Foo_i.h
@@ -25,8 +25,7 @@ public:
   Tie_i (CORBA::Long value);
 
   // Simple doit method
-  virtual CORBA::Long doit (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long doit (CORBA::Environment &env);
 
 protected:
 
@@ -41,8 +40,7 @@ public:
        PortableServer::POA_ptr poa);
 
   // Simple doit method
-  virtual CORBA::Long doit (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long doit (CORBA::Environment &env);
 
   // Returns the Default POA of this Servant object
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
@@ -67,8 +65,7 @@ public:
          PortableServer::POA_ptr poa);
 
     // Simple doit method
-    virtual CORBA::Long doit (CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Long doit (CORBA::Environment &env);
 
     // Returns the Default POA of this Servant object
     virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
@@ -93,8 +90,7 @@ public:
            PortableServer::POA_ptr poa);
 
       // Simple doit method
-      virtual CORBA::Long doit (CORBA::Environment &env)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      virtual CORBA::Long doit (CORBA::Environment &env);
 
       // Returns the Default POA of this Servant object
       virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile
index 30ad6a94a5c..6fd5e1731b2 100644
--- a/TAO/examples/POA/TIE/Makefile
+++ b/TAO/examples/POA/TIE/Makefile
@@ -212,7 +212,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -232,25 +243,14 @@ 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 \
- $(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/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 \
@@ -266,8 +266,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -306,7 +305,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -465,7 +463,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -485,25 +494,14 @@ 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 \
- $(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/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 \
@@ -519,8 +517,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -559,7 +556,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -719,7 +715,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -739,25 +746,14 @@ 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 \
- $(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/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 \
@@ -773,8 +769,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -813,7 +808,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -980,7 +974,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1000,25 +1005,14 @@ 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 \
- $(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/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 \
@@ -1034,8 +1028,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1074,7 +1067,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1233,7 +1225,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1253,25 +1256,14 @@ 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 \
- $(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/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 \
@@ -1287,8 +1279,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1327,7 +1318,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp
index 3306844d5d4..ca780b649ac 100644
--- a/TAO/examples/POA/TIE/client.cpp
+++ b/TAO/examples/POA/TIE/client.cpp
@@ -34,22 +34,22 @@ parse_args (int argc, char **argv)
     switch (c)
       {
       case 'a':
-        IOR[1] = ACE_OS::strdup (get_opts.optarg);
+        IOR[1] = get_opts.optarg;
         break;
       case 'b':
-        IOR[2] = ACE_OS::strdup (get_opts.optarg);
+        IOR[2] = get_opts.optarg;
         break;
       case 'c':
-        IOR[3] = ACE_OS::strdup (get_opts.optarg);
+        IOR[3] = get_opts.optarg;
         break;
       case 'd':
-        IOR[4] = ACE_OS::strdup (get_opts.optarg);
+        IOR[4] = get_opts.optarg;
         break;
       case 'e':
-        IOR[5] = ACE_OS::strdup (get_opts.optarg);
+        IOR[5] = get_opts.optarg;
         break;
       case 'f':
-        IOR[6] = ACE_OS::strdup (get_opts.optarg);
+        IOR[6] = get_opts.optarg;
         break;
       case 'i':
         iterations = ::atoi (get_opts.optarg);
@@ -110,30 +110,28 @@ class Test
 public:
   static void run (CORBA::ORB_ptr orb, 
 		   char *IOR,
-		   CORBA::Environment &ACE_TRY_ENV)
+		   CORBA::Environment &env)
   {
     if (IOR != 0)
       {
         // Get an object reference from the argument string.
-        CORBA::Object_var object = orb->string_to_object (IOR, ACE_TRY_ENV);
-        ACE_CHECK;
+        CORBA::Object_var object = orb->string_to_object (IOR, env);
 
-        /*if (env.exception () != 0)
+        if (env.exception () != 0)
           {
             env.print_exception ("CORBA::ORB::string_to_object");
             return;
           }
-        */
+
         // Try to narrow the object reference to a reference.
-        T_var foo = T::_narrow (object.in (), ACE_TRY_ENV);
-        ACE_CHECK;
+        T_var foo = T::_narrow (object.in (), env);
       
-        /*if (env.exception () != 0)
+        if (env.exception () != 0)
           {
             env.print_exception ("_narrow");
             return;
           }
-        */
+
         ACE_Profile_Timer timer;
         ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
 
@@ -142,11 +140,10 @@ public:
 
         CORBA::Long result = 0;
         int i = 0;
-        for (i = 0; i < iterations ; i++)
+        for (i = 0; i < iterations && env.exception () == 0; i++)
           {
             // Invoke the doit() method on the reference.
-            result = foo->doit (ACE_TRY_ENV);
-            ACE_CHECK;
+            result = foo->doit (env);
           }
      
         // stop the timer.
@@ -156,12 +153,12 @@ public:
         // compute average time.
         print_stats (elapsed_time, i);
 
-        /*if (env.exception () != 0)
+        if (env.exception () != 0)
           {
             env.print_exception ("doit");
             return;
           }
-        */
+  
         // Print the result of doit () method on the reference.
         ACE_DEBUG ((LM_DEBUG,
                     "%d\n",
@@ -173,60 +170,47 @@ public:
 int
 main (int argc, char **argv)
 {
-  //CORBA::Environment env;
+  CORBA::Environment env;
 
-  
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  // Initialize the ORB
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+  if (env.exception () != 0)
     {
-        // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-      // Initialize options based on command-line arguments.
-      int parse_args_result = parse_args (argc, argv);
-      if (parse_args_result != 0)
-        return parse_args_result;
-  
-      int i = 1;
-
-      Test<A, A_var>::run (orb.in (), 
-                           IOR[i++], 
-                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Test<Outer::B, Outer::B_var>::run (orb.in (), 
-                                         IOR[i++], 
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (), 
-                                                       IOR[i++], 
-                                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Test<A, A_var>::run (orb.in (),
-                           IOR[i++], 
-                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Test<Outer::B, Outer::B_var>::run (orb.in (), 
-                                         IOR[i++], 
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (), 
-                                                       IOR[i++], 
-                                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception Caught in main");
+      env.print_exception ("CORBA::ORB_init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+
+  // Initialize options based on command-line arguments.
+  int parse_args_result = parse_args (argc, argv);
+  if (parse_args_result != 0)
+    return parse_args_result;
+  
+  int i = 1;
+
+  Test<A, A_var>::run (orb.in (), 
+                       IOR[i++], 
+                       env);
+
+  Test<Outer::B, Outer::B_var>::run (orb.in (), 
+                                     IOR[i++], 
+                                     env);
+
+  Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (), 
+                                                   IOR[i++], 
+                                                   env);
+
+  Test<A, A_var>::run (orb.in (),
+                       IOR[i++], 
+                       env);
+
+  Test<Outer::B, Outer::B_var>::run (orb.in (), 
+                                     IOR[i++], 
+                                     env);
+
+  Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (), 
+                                                   IOR[i++], 
+                                                   env);
+
   return 0;
 }
 
diff --git a/TAO/examples/POA/TIE/run_test.pl b/TAO/examples/POA/TIE/run_test.pl
deleted file mode 100755
index 69d5f6bcb4c..00000000000
--- a/TAO/examples/POA/TIE/run_test.pl
+++ /dev/null
@@ -1,53 +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 = "ior";
-
-$iorfile_1 = $iorfile."_1";
-$iorfile_2 = $iorfile."_2";
-$iorfile_3 = $iorfile."_3";
-$iorfile_4 = $iorfile."_4";
-$iorfile_5 = $iorfile."_5";
-$iorfile_6 = $iorfile."_6";
-
-unlink $iorfile_1;
-unlink $iorfile_2;
-unlink $iorfile_3;
-unlink $iorfile_4;
-unlink $iorfile_5;
-unlink $iorfile_6;
-
-$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT");
-
-# In this example all the files are written out at the same time. So  make a
-# check only for the first file
-if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
-}
-
-ACE::waitforfile ($iorfile_1);
-$status  = Process::Create ($EXEPREFIX."client$Process::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) {
-$status  = Process::Create ($EXEPREFIX."client$Process::EXE_EXT  -e file://$iorfile_5 -f file://$iorfile_6");
-}
-
-unlink $iorfile_1;
-unlink $iorfile_2;
-unlink $iorfile_3;
-unlink $iorfile_4;
-unlink $iorfile_5;
-unlink $iorfile_6;
-
-$SV->Kill ();$SV->Wait ();
-
-exit $client;
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index 8264cb6f8bf..5df931b3beb 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -22,249 +22,271 @@ ACE_RCSID(TIE, server, "$Id$")
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  char str[256];
+  // Initialize the ORB first.
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
 
-  ACE_TRY
+  if (env.exception () != 0)
     {
-      ACE_OS::strcpy (str, "CORBA::ORB_init");
-
-      // 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_OS::strcpy (str, "PortableServer::POA::_narrow");
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
 
-      // Get the POA_var object from Object_var.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Obtain the RootPOA.
+  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
-      ACE_OS::strcpy (str, "PortableServer::POA::the_POAManager");
-      // Get the POAManager of the RootPOA.
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // 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");
+      return -1;
+    }
 
-      // Policies for the firstPOA to be created.
-      CORBA::PolicyList policies (2);
-      policies.length (2);
+  // Get the POAManager of the RootPOA.
+  PortableServer::POAManager_var poa_manager =
+    root_poa->the_POAManager (env);
 
-      ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy");
-      // Lifespan policy
-      policies[0] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::the_POAManager");
+      return -1;
+    }
 
-      ACE_OS::strcpy (str, "PortableServer::POA::create_implicit_activation_policy");
-      // Implicit activation policy
-      policies[1] =
-        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Policies for the firstPOA to be created.
+  CORBA::PolicyList policies (2); 
+  policies.length (2);
 
-      ACE_OS::strcpy (str, "PortableServer::POA::create_POA");
-      // Create the firstPOA under the RootPOA.
-      ACE_CString name = "firstPOA";
-      PortableServer::POA_var first_poa =
-        root_poa->create_POA (name.c_str (),
-                              poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Lifespan policy
+  policies[0] = 
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_lifespan_policy");
+      return -1;
+    }
 
+  // Implicit activation policy
+  policies[1] = 
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_implicit_activation_policy");
+      return -1;
+    }
 
-      ACE_OS::strcpy (str,"PortableServer::POA::create_POA");
+  // Create the firstPOA under the RootPOA.
+  ACE_CString name = "firstPOA";
+  PortableServer::POA_var first_poa =
+    root_poa->create_POA (name.c_str (),
+                          poa_manager.in (),
+                          policies,
+                          env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
 
-      // Creation of POAs is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < policies.length ();
-           ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
+  // Creation of POAs is over. Destroy the Policy objects.
+  for (CORBA::ULong i = 0;
+       i < policies.length () && env.exception () == 0;
+       ++i)
+    {
+      CORBA::Policy_ptr policy = policies[i];
+      policy->destroy (env);
+    }
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
 
-      // Create A_i
-      A_i a_impl (27, first_poa.in ());
+  // Create A_i
+  A_i a_impl (27, first_poa.in ());
 
-      // Create B_i
-      Outer_i::B_i b_impl (28, first_poa.in ());
+  // Create B_i
+  Outer_i::B_i b_impl (28, first_poa.in ());
 
-      // Create C_i
-      Outer_i::Inner_i::C_i c_impl (29, first_poa.in ());
+  // Create C_i
+  Outer_i::Inner_i::C_i c_impl (29, first_poa.in ());
 
-      // Create A tie
-      Tie_i a_tie_i (30);
-      POA_A_tie <Tie_i> a_tie_impl (a_tie_i, first_poa.in ());
+  // Create A tie
+  Tie_i a_tie_i (30);
+  POA_A_tie <Tie_i> a_tie_impl (a_tie_i, first_poa.in ());
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
-      // Create B tie
-      Tie_i b_tie_i (31);
-      POA_Outer::B_tie <Tie_i> b_tie_impl (b_tie_i, first_poa.in ());
+  // Create B tie
+  Tie_i b_tie_i (31);
+  POA_Outer::B_tie <Tie_i> b_tie_impl (b_tie_i, first_poa.in ());
 
-      // Create C tie
-      Tie_i c_tie_i (32);
-      POA_Outer::Inner::C_tie <Tie_i> c_tie_impl (c_tie_i, first_poa.in ());
+  // Create C tie
+  Tie_i c_tie_i (32);
+  POA_Outer::Inner::C_tie <Tie_i> c_tie_impl (c_tie_i, first_poa.in ());
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-      ACE_OS::strcpy (str, "POA_A::_this");
-      // Get Object Reference for the a_impl object.
-      A_var a = a_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Get Object Reference for the a_impl object.
+  A_var a = a_impl._this (env);
 
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA_A::_this");
+      return -1;
+    }
 
-      ACE_OS::strcpy (str, "POA_Outer::B::_this");
-      // Get Object Reference for the b_impl object.
-      Outer::B_var b = b_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Get Object Reference for the b_impl object.
+  Outer::B_var b = b_impl._this (env);
 
-      ACE_OS::strcpy (str, "POA_Outer::Inner::C::_this");
-      // Get Object Reference for the c_impl object.
-      Outer::Inner::C_var c = c_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA_Outer::B::_this");
+      return -1;
+    }
+
+  // Get Object Reference for the c_impl object.
+  Outer::Inner::C_var c = c_impl._this (env);
 
-      ACE_OS::strcpy (str, "POA_A::_this");
-      // Get Object Reference for the a_tie_impl object.
-      A_var a_tie = a_tie_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA_Outer::Inner::C::_this");
+      return -1;
+    }
 
+  // Get Object Reference for the a_tie_impl object.
+  A_var a_tie = a_tie_impl._this (env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA_A::_this");
+      return -1;
+    }
 
 #if defined (ACE_HAS_USING_KEYWORD)
-      ACE_OS::strcpy (str, "POA_Outer::B::_this");
-      // Get Object Reference for the a_tie_impl object.
-      Outer::B_var b_tie = b_tie_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
 
+  // Get Object Reference for the a_tie_impl object.
+  Outer::B_var b_tie = b_tie_impl._this (env);
 
-      ACE_OS::strcpy (str, "POA_Outer::C::_this");
-      // Get Object Reference for the c_tie_impl object.
-      Outer::Inner::C_var c_tie = c_tie_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA_Outer::B::_this");
+      return -1;
+    }
+
+  // Get Object Reference for the c_tie_impl object.
+  Outer::Inner::C_var c_tie = c_tie_impl._this (env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA_Outer::Inner::C::_this");
+      return -1;
+    }
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-      ACE_OS::strcpy (str, "CORBA::ORB::object_to_string");
-      // Stringyfy all the object references and print them out.
-      CORBA::String_var first_ior =
-        orb->object_to_string (a.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-      // Stringyfy all the object references and print them out.
-      CORBA::String_var second_ior =
-        orb->object_to_string (b.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Stringyfy all the object references and print them out.
-      CORBA::String_var third_ior =
-        orb->object_to_string (c.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Stringyfy all the object references and print them out.
-      CORBA::String_var forth_ior =
-        orb->object_to_string (a_tie.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      FILE *output_file_1 = ACE_OS::fopen ("ior_1", "w");
-      FILE *output_file_2 = ACE_OS::fopen ("ior_2", "w");
-      FILE *output_file_3 = ACE_OS::fopen ("ior_3", "w");
-      FILE *output_file_4 = ACE_OS::fopen ("ior_4", "w");
-
-      if (output_file_1)
-        ACE_OS::fprintf (output_file_1, 
-                         "%s",
-                         first_ior.in ());
-      if (output_file_2)
-        ACE_OS::fprintf (output_file_2, 
-                         "%s",
-                         second_ior.in ());
-      if (output_file_3)
-        ACE_OS::fprintf (output_file_3, 
-                         "%s",
-                         third_ior.in ());
-      if (output_file_4)
-        ACE_OS::fprintf (output_file_4, 
-                         "%s",
-                         forth_ior.in ());
-      
-      ACE_OS::fclose (output_file_1);      
-      ACE_OS::fclose (output_file_2);
-      ACE_OS::fclose (output_file_3);
-      ACE_OS::fclose (output_file_4);
+  // Stringyfy all the object references and print them out.
+  CORBA::String_var first_ior =
+    orb->object_to_string (a.in (), env);
 
-#if defined (ACE_HAS_USING_KEYWORD)
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
+
+  // Stringyfy all the object references and print them out.
+  CORBA::String_var second_ior =
+    orb->object_to_string (b.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
+
+  // Stringyfy all the object references and print them out.
+  CORBA::String_var third_ior =
+    orb->object_to_string (c.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
 
-      // Stringyfy all the object references and print them out.
-      CORBA::String_var fifth_ior =
-        orb->object_to_string (b_tie.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Stringyfy all the object references and print them out.
+  CORBA::String_var forth_ior =
+    orb->object_to_string (a_tie.in (), env);
 
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
 
-      // Stringyfy all the object references and print them out.
-      CORBA::String_var sixth_ior =
-        orb->object_to_string (c_tie.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+#if defined (ACE_HAS_USING_KEYWORD)
 
-      FILE *output_file_5 = ACE_OS::fopen ("ior_5", "w");
-      FILE *output_file_6 = ACE_OS::fopen ("ior_6", "w");
-      
-      if (output_file_5)
-        ACE_OS::fprintf (output_file_5, 
-                         "%s",
-                         fifth_ior.in ());
-      if (output_file_6)
-        ACE_OS::fprintf (output_file_6, 
-                         "%s",
-                         sixth_ior.in ());
+  // Stringyfy all the object references and print them out.
+  CORBA::String_var fifth_ior =
+    orb->object_to_string (b_tie.in (), env);
 
-      ACE_OS::fclose (output_file_5);      
-      ACE_OS::fclose (output_file_6);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
+
+  // Stringyfy all the object references and print them out.
+  CORBA::String_var sixth_ior =
+    orb->object_to_string (c_tie.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s\n%s\n%s\n%s\n",
-                  first_ior.in (),
-                  second_ior.in (),
-                  third_ior.in (),
-                  forth_ior.in ()));
+  ACE_DEBUG ((LM_DEBUG, 
+              "%s\n%s\n%s\n%s\n",
+              first_ior.in (),
+              second_ior.in (),
+              third_ior.in (),
+              forth_ior.in ()));
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s\n%s\n",
-                  fifth_ior.in (),
-                  sixth_ior.in ()));
+  ACE_DEBUG ((LM_DEBUG, 
+              "%s\n%s\n",
+              fifth_ior.in (),
+              sixth_ior.in ()));
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  poa_manager->activate (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::activate");
+      return -1;
+    }
 
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+  if (orb->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
 
-      ACE_OS::strcpy (str, "PortableServer::POA::destroy");
-      // Destroy RootPOA.
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
+  // Destroy RootPOA.
+  root_poa->destroy (1,
+                     1,
+                     env);
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      env.print_exception ("PortableServer::POA::destroy");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile
index 481e6ca8692..ab997d801d9 100644
--- a/TAO/examples/Quoter/Makefile
+++ b/TAO/examples/Quoter/Makefile
@@ -255,7 +255,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -275,25 +286,14 @@ 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 \
- $(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/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 \
@@ -309,8 +309,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -349,7 +348,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -527,7 +525,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -547,25 +556,14 @@ 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 \
- $(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/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 \
@@ -581,8 +579,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -621,7 +618,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -795,7 +791,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -815,25 +822,14 @@ 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 \
- $(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/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 \
@@ -849,8 +845,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -889,7 +884,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1070,7 +1064,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1090,25 +1095,14 @@ 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 \
- $(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/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 \
@@ -1124,8 +1118,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1164,7 +1157,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1354,7 +1346,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1374,25 +1377,14 @@ 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 \
- $(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/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 \
@@ -1408,8 +1400,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1448,7 +1439,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1623,7 +1613,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1643,25 +1644,14 @@ 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 \
- $(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/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 \
@@ -1677,8 +1667,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1717,7 +1706,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1898,7 +1886,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1918,25 +1917,14 @@ 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 \
- $(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/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 \
@@ -1952,8 +1940,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1992,7 +1979,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2167,7 +2153,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2187,25 +2184,14 @@ 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 \
- $(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/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 \
@@ -2221,8 +2207,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2261,7 +2246,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2444,7 +2428,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2464,25 +2459,14 @@ 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 \
- $(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/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 \
@@ -2498,8 +2482,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2538,7 +2521,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 4cb71221113..5148bd26981 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -75,10 +75,9 @@ Server<Servant>::parse_args (void)
 template <class Servant> int
 Server<Servant>::test_for_ins (CORBA::String_var ior)
 {
-  CORBA::ORB_var orb = this->orb_manager_.orb ();
 
   CORBA::Object_ptr object =
-    orb->string_to_object (ior.in ());
+    this->orb_manager_.orb ()->string_to_object (ior.in ());
 
   // Add a KEY:IOR mapping to the ORB table.
   ACE_CString ins (this->ins_);
@@ -89,8 +88,8 @@ Server<Servant>::test_for_ins (CORBA::String_var ior)
 		ins.c_str (),
 		ior.in ()));
 
-  if (orb->_tao_add_to_IOR_table (ins,
-                                  object) != 0)
+  if (this->orb_manager_.orb ()->_tao_add_to_IOR_table (ins,
+							object) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
 		       "Simple_Util : Unable to add IOR to table\n"),
 		      -1);
@@ -201,11 +200,8 @@ Server<Servant>::run (CORBA::Environment &env)
 template <class Servant> int
 Server<Servant>::register_name (void)
 {
-  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 ());
+  this->naming_server_.init (this->orb_manager_.orb(),
+                             this->orb_manager_.child_poa ());
   // create the name for the naming service
 
   CosNaming::Name bindName;
@@ -227,7 +223,8 @@ Server<Servant>::register_name (void)
 
       // Test for INS.
       if (this->ins_)
-	if (this->test_for_ins (orb->object_to_string (object.in ())) != 0)
+	if (this->test_for_ins (this->orb_manager_.orb ()
+				->object_to_string (object.in ())) != 0)
 	  ACE_ERROR_RETURN ((LM_ERROR,
 			     "test_for_ins (): failed\n"),
 			    -1);
diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile
index 34326baaa52..c7e489775fb 100644
--- a/TAO/examples/Simple/bank/Makefile
+++ b/TAO/examples/Simple/bank/Makefile
@@ -238,7 +238,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -258,25 +269,14 @@ 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/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/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 \
@@ -292,8 +292,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -332,7 +331,6 @@ realclean: clean
  $(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 \
@@ -491,7 +489,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -511,25 +520,14 @@ 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/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/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 \
@@ -545,8 +543,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -585,7 +582,6 @@ realclean: clean
  $(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 \
@@ -748,7 +744,16 @@ realclean: clean
  $(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 \
@@ -770,21 +775,12 @@ realclean: clean
  $(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/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 \
@@ -800,8 +796,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -840,7 +835,6 @@ realclean: clean
  $(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 \
@@ -1029,7 +1023,16 @@ realclean: clean
  $(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 \
@@ -1051,21 +1054,12 @@ realclean: clean
  $(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/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 \
@@ -1081,8 +1075,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1121,7 +1114,6 @@ realclean: clean
  $(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 \
@@ -1307,7 +1299,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1327,25 +1330,14 @@ 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/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/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 \
@@ -1361,8 +1353,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1401,7 +1392,6 @@ realclean: clean
  $(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 \
@@ -1564,7 +1554,16 @@ realclean: clean
  $(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 \
@@ -1586,21 +1585,12 @@ realclean: clean
  $(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/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 \
@@ -1616,8 +1606,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1656,7 +1645,6 @@ realclean: clean
  $(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 \
@@ -1819,7 +1807,16 @@ realclean: clean
  $(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 \
@@ -1841,21 +1838,12 @@ realclean: clean
  $(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/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 \
@@ -1871,8 +1859,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1911,7 +1898,6 @@ realclean: clean
  $(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 \
@@ -2100,7 +2086,16 @@ realclean: clean
  $(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 \
@@ -2122,21 +2117,12 @@ realclean: clean
  $(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/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 \
@@ -2152,8 +2138,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2192,7 +2177,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index 7c9c9f74806..a8bb90c667e 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -86,16 +86,14 @@ Client_i::init (int argc, char *argv[])
   TAO_TRY
     {
       // Retrieve the ORB.
-      this->orb_manager_.init (argc,
-                               argv,
-                               0,
-                               TAO_TRY_ENV);
+      this->orb_ = CORBA::ORB_init (argc,
+				    argv,
+				    0,
+				    TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      CORBA::ORB_var orb = this->orb_manager_.orb ();
-
       // set the orb in the receiver_i_ object.
-      this->receiver_i_.orb (orb.in ());
+      this->receiver_i_.orb (this->orb_.in ());
 
       // read the ior from file
       if (this->read_ior (this->ior_file_name_) != 0)
@@ -105,8 +103,8 @@ Client_i::init (int argc, char *argv[])
 			  -1);
 
       CORBA::Object_var server_object =
-	orb->string_to_object (this->ior_,
-                               TAO_TRY_ENV);
+	this->orb_->string_to_object (this->ior_,
+				      TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       if (CORBA::is_nil (server_object.in ()))
@@ -151,10 +149,6 @@ Client_i::run (void)
 
   TAO_TRY
     {
-      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 (TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -166,8 +160,7 @@ Client_i::run (void)
       TAO_CHECK_ENV;
 
       // Run the ORB.
-      this->orb_manager_.run (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      this->orb_->run ();
     }
   TAO_CATCHANY
     {
diff --git a/TAO/examples/Simple/chat/Client_i.h b/TAO/examples/Simple/chat/Client_i.h
index e1cf006f07a..bbbd82d289e 100644
--- a/TAO/examples/Simple/chat/Client_i.h
+++ b/TAO/examples/Simple/chat/Client_i.h
@@ -74,12 +74,12 @@ public:
   const char* nickname_;
   // Nickname of the user chatting.
 
-  TAO_ORB_Manager orb_manager_;
-  // Our orb.
-
   Broadcaster_var server_;
   // Server object ptr.
 
+  CORBA::ORB_var orb_;
+  // Our orb.
+
   Receiver_i receiver_i_;
   // The receiver object.
 
diff --git a/TAO/examples/Simple/chat/Makefile b/TAO/examples/Simple/chat/Makefile
index 90a6a02eba0..90d85e1363b 100644
--- a/TAO/examples/Simple/chat/Makefile
+++ b/TAO/examples/Simple/chat/Makefile
@@ -228,7 +228,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -248,25 +259,14 @@ 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/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/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 \
@@ -282,8 +282,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -322,7 +321,6 @@ realclean: clean
  $(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 \
@@ -482,7 +480,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -502,25 +511,14 @@ 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/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/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 \
@@ -536,8 +534,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -576,7 +573,6 @@ realclean: clean
  $(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 \
@@ -735,7 +731,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -755,25 +762,14 @@ 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/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/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 \
@@ -789,8 +785,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -829,7 +824,6 @@ realclean: clean
  $(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 \
@@ -991,7 +985,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1011,25 +1016,14 @@ 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/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/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 \
@@ -1045,8 +1039,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1085,7 +1078,6 @@ realclean: clean
  $(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 \
@@ -1246,7 +1238,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1266,25 +1269,14 @@ 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/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/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 \
@@ -1300,8 +1292,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1340,7 +1331,6 @@ realclean: clean
  $(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 \
@@ -1500,7 +1490,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1520,25 +1521,14 @@ 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/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/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 \
@@ -1554,8 +1544,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1594,7 +1583,6 @@ realclean: clean
  $(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 \
@@ -1757,7 +1745,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1777,25 +1776,14 @@ 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/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/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 \
@@ -1811,8 +1799,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1851,7 +1838,6 @@ realclean: clean
  $(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 \
@@ -2017,7 +2003,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2037,25 +2034,14 @@ 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/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/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 \
@@ -2071,8 +2057,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2111,7 +2096,6 @@ realclean: clean
  $(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 \
@@ -2275,7 +2259,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2295,25 +2290,14 @@ 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/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/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 \
@@ -2329,8 +2313,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2369,7 +2352,6 @@ realclean: clean
  $(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 \
@@ -2533,7 +2515,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2553,25 +2546,14 @@ 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/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/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 \
@@ -2587,8 +2569,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2627,7 +2608,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index e2479811f2e..dca164d5ba6 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -54,7 +54,7 @@ private:
   // Writes the server ior to a file, for the clients to pick up
   // later.
 
-  const char *ior_file_name_;
+  char *ior_file_name_;
   // The file name to save the ior to.
 
   TAO_ORB_Manager orb_manager_;
diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile
index cc418e42f1f..2e3a871734b 100644
--- a/TAO/examples/Simple/echo/Makefile
+++ b/TAO/examples/Simple/echo/Makefile
@@ -235,7 +235,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -255,25 +266,14 @@ 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/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/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 \
@@ -289,8 +289,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -329,7 +328,6 @@ realclean: clean
  $(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 \
@@ -488,7 +486,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -508,25 +517,14 @@ 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/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/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 \
@@ -542,8 +540,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -582,7 +579,6 @@ realclean: clean
  $(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 \
@@ -745,7 +741,16 @@ realclean: clean
  $(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 \
@@ -767,21 +772,12 @@ realclean: clean
  $(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/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 \
@@ -797,8 +793,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -837,7 +832,6 @@ realclean: clean
  $(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 \
@@ -1026,7 +1020,16 @@ realclean: clean
  $(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 \
@@ -1048,21 +1051,12 @@ realclean: clean
  $(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/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 \
@@ -1078,8 +1072,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1118,7 +1111,6 @@ realclean: clean
  $(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 \
@@ -1304,7 +1296,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1324,25 +1327,14 @@ 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/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/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 \
@@ -1358,8 +1350,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1398,7 +1389,6 @@ realclean: clean
  $(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 \
@@ -1561,7 +1551,16 @@ realclean: clean
  $(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 \
@@ -1583,21 +1582,12 @@ realclean: clean
  $(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/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 \
@@ -1613,8 +1603,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1653,7 +1642,6 @@ realclean: clean
  $(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 \
@@ -1842,7 +1830,16 @@ realclean: clean
  $(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 \
@@ -1864,21 +1861,12 @@ realclean: clean
  $(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/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 \
@@ -1894,8 +1882,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1934,7 +1921,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile
index 831b8e96999..bfbb52abd28 100644
--- a/TAO/examples/Simple/grid/Makefile
+++ b/TAO/examples/Simple/grid/Makefile
@@ -236,7 +236,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -256,25 +267,14 @@ 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/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/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 \
@@ -290,8 +290,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -330,7 +329,6 @@ realclean: clean
  $(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 \
@@ -489,7 +487,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -509,25 +518,14 @@ 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/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/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 \
@@ -543,8 +541,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -583,7 +580,6 @@ realclean: clean
  $(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 \
@@ -746,7 +742,16 @@ realclean: clean
  $(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 \
@@ -768,21 +773,12 @@ realclean: clean
  $(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/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 \
@@ -798,8 +794,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -838,7 +833,6 @@ realclean: clean
  $(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 \
@@ -1027,7 +1021,16 @@ realclean: clean
  $(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 \
@@ -1049,21 +1052,12 @@ realclean: clean
  $(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/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 \
@@ -1079,8 +1073,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1119,7 +1112,6 @@ realclean: clean
  $(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 \
@@ -1305,7 +1297,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1325,25 +1328,14 @@ 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/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/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 \
@@ -1359,8 +1351,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1399,7 +1390,6 @@ realclean: clean
  $(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 \
@@ -1562,7 +1552,16 @@ realclean: clean
  $(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 \
@@ -1584,21 +1583,12 @@ realclean: clean
  $(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/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 \
@@ -1614,8 +1604,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1654,7 +1643,6 @@ realclean: clean
  $(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 \
@@ -1843,7 +1831,16 @@ realclean: clean
  $(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 \
@@ -1865,21 +1862,12 @@ realclean: clean
  $(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/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 \
@@ -1895,8 +1883,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1935,7 +1922,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/Simple/time-date/Makefile b/TAO/examples/Simple/time-date/Makefile
index 899dcfde611..9c6200d15f5 100644
--- a/TAO/examples/Simple/time-date/Makefile
+++ b/TAO/examples/Simple/time-date/Makefile
@@ -13,32 +13,31 @@ ifndef TAO_ROOT
 endif
 
 LIBNAME = libTime_Date
-LIB     = $(LIBNAME).a
-SHLIB   = $(LIBNAME).$(SOEXT)
+LIB   	= $(LIBNAME).a
+SHLIB	= $(LIBNAME).$(SOEXT)
 
-FILES   = Time_Date Time_Date_i Time_DateS Time_DateC
-LSRC    = $(addsuffix .cpp,$(FILES))
+FILES   = Time_Date
+LSRC	= $(addsuffix .cpp,$(FILES))
 
-LDLIBS  = -lorbsvcs -lTAO
-LIBS    = $(LDLIBS)
+LDLIBS = -lorbsvcs -lTAO
 
 IDL_SRC = Time_DateC.cpp Time_DateS.cpp
 
 PROG_SRCS = client.cpp \
-            server.cpp \
-            Time_Date_i.cpp \
-            Time_Date_Client_i.cpp \
-            ../Simple_util.cpp
+	    server.cpp \
+	    Time_Date_i.cpp \
+	    Time_Date_Client_i.cpp \
+	    ../Simple_util.cpp
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = Time_DateC.o \
-                  Time_DateS.o \
-                  client.o \
-                  ../Simple_util.o \
-                  Time_Date_Client_i.o
+		  Time_DateS.o \
+		  client.o \
+		  ../Simple_util.o \
+		  Time_Date_Client_i.o
 SIMPLE_SVR_OBJS = Time_DateC.o \
-                  Time_DateS.o \
+		  Time_DateS.o \
                   Time_Date_i.o \
                   server.o \
                   ../Simple_util.o
@@ -175,8 +174,8 @@ realclean: clean
  $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
- Time_Date.h Time_Date_i.h Time_DateS.h Time_DateC.h \
- $(TAO_ROOT)/tao/corba.h \
+ Time_Date.h \
+ $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -189,31 +188,7 @@ 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/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 \
- $(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/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
@@ -221,223 +196,22 @@ realclean: clean
  $(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/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/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 \
- $(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 \
- Time_DateC.i Time_DateS_T.h Time_DateS_T.i Time_DateS_T.cpp \
- Time_DateS.i \
- $(TAO_ROOT)/tao/TAO.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
-.obj/Time_Date_i.o .obj/Time_Date_i.so .shobj/Time_Date_i.o .shobj/Time_Date_i.so: Time_Date_i.cpp Time_Date_i.h Time_DateS.h Time_DateC.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 \
@@ -449,42 +223,11 @@ realclean: clean
  $(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 \
+ Time_Date_i.h Time_DateS.h Time_DateC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -511,31 +254,6 @@ realclean: clean
  $(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 \
@@ -546,226 +264,6 @@ realclean: clean
  $(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 \
- Time_DateC.i 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 \
- $(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 \
@@ -785,25 +283,14 @@ 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/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/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 \
@@ -819,8 +306,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -840,10 +326,6 @@ realclean: clean
  $(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 \
@@ -853,13 +335,10 @@ realclean: clean
  $(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 \
@@ -1019,31 +498,8 @@ realclean: clean
  $(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 \
@@ -1054,226 +510,6 @@ realclean: clean
  $(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 \
- 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 \
- $(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 \
@@ -1293,25 +529,14 @@ 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/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/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 \
@@ -1327,8 +552,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1367,7 +591,6 @@ realclean: clean
  $(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 \
@@ -1527,7 +750,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1547,25 +781,14 @@ 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/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/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 \
@@ -1581,8 +804,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1621,7 +843,6 @@ realclean: clean
  $(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 \
@@ -1785,7 +1006,16 @@ realclean: clean
  $(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 \
@@ -1807,21 +1037,12 @@ realclean: clean
  $(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/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 \
@@ -1837,8 +1058,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1877,7 +1097,6 @@ realclean: clean
  $(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 \
@@ -2133,7 +1352,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2153,25 +1383,14 @@ 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/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/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 \
@@ -2187,8 +1406,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2227,7 +1445,6 @@ realclean: clean
  $(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 \
@@ -2392,7 +1609,16 @@ realclean: clean
  $(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 \
@@ -2414,21 +1640,12 @@ realclean: clean
  $(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/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 \
@@ -2444,8 +1661,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2484,7 +1700,6 @@ realclean: clean
  $(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 \
@@ -2673,7 +1888,16 @@ realclean: clean
  $(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 \
@@ -2695,21 +1919,12 @@ realclean: clean
  $(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/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 \
@@ -2725,8 +1940,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2765,7 +1979,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile
index 05710db6f9b..4dacfa58b10 100644
--- a/TAO/examples/Simple/time/Makefile
+++ b/TAO/examples/Simple/time/Makefile
@@ -236,7 +236,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -256,25 +267,14 @@ 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/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/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 \
@@ -290,8 +290,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -330,7 +329,6 @@ realclean: clean
  $(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 \
@@ -489,7 +487,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -509,25 +518,14 @@ 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/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/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 \
@@ -543,8 +541,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -583,7 +580,6 @@ realclean: clean
  $(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 \
@@ -746,7 +742,16 @@ realclean: clean
  $(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 \
@@ -768,21 +773,12 @@ realclean: clean
  $(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/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 \
@@ -798,8 +794,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -838,7 +833,6 @@ realclean: clean
  $(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 \
@@ -1027,7 +1021,16 @@ realclean: clean
  $(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 \
@@ -1049,21 +1052,12 @@ realclean: clean
  $(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/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 \
@@ -1079,8 +1073,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1119,7 +1112,6 @@ realclean: clean
  $(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 \
@@ -1305,7 +1297,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1325,25 +1328,14 @@ 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/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/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 \
@@ -1359,8 +1351,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1399,7 +1390,6 @@ realclean: clean
  $(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 \
@@ -1562,7 +1552,16 @@ realclean: clean
  $(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 \
@@ -1584,21 +1583,12 @@ realclean: clean
  $(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/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 \
@@ -1614,8 +1604,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1654,7 +1643,6 @@ realclean: clean
  $(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 \
@@ -1843,7 +1831,16 @@ realclean: clean
  $(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 \
@@ -1865,21 +1862,12 @@ realclean: clean
  $(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/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 \
@@ -1895,8 +1883,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1935,7 +1922,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/examples/Simulator/DOVEMIB/clnt.h b/TAO/examples/Simulator/DOVEMIB/clnt.h
index c5582c2dd9b..bec38868e21 100644
--- a/TAO/examples/Simulator/DOVEMIB/clnt.h
+++ b/TAO/examples/Simulator/DOVEMIB/clnt.h
@@ -42,19 +42,11 @@ public:
   // Initialize the client communication endpoint with server.
 
 private:
-
-  CORBA::ORB_var orb_;
-  // Remember our orb: this needs to be declared before any member that
-  // depends on it so it is constructed before and destroyed after them.
-
   Navigation navigation_;
-  // Navigation data structure.
-
   Weapons weapons_;
-  // Weapons data structure.
 
   Any_Test_ptr any_test_ptr_;
-  //  Reverse_ptr reverse_ptr_;
+ //  Reverse_ptr reverse_ptr_;
 
   int argc_;
   // # of arguments on the command line.
@@ -62,7 +54,14 @@ private:
   char **argv_;
   // arguments from command line.
 
+
   CORBA::Environment env_;
   // Environment variable
 
+  CORBA::ORB_var orb_;
+  // Remember our orb
 };
+
+
+
+
diff --git a/TAO/examples/Simulator/DOVEMIB/svc.conf b/TAO/examples/Simulator/DOVEMIB/svc.conf
index e5af6a64d09..eb4772f319e 100644
--- a/TAO/examples/Simulator/DOVEMIB/svc.conf
+++ b/TAO/examples/Simulator/DOVEMIB/svc.conf
@@ -1,4 +1,5 @@
 # $Id$
 #
-
-static Server_Strategy_Factory "-ORBdemuxstrategy dynamic -ORBtablesize 128"
+static Resource_Factory "-ORBresources global"
+static Client_Strategy_Factory ""
+static Server_Strategy_Factory "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Simulator/Event_Supplier/svc.conf b/TAO/examples/Simulator/Event_Supplier/svc.conf
index 34bf7564c6e..eb4772f319e 100644
--- a/TAO/examples/Simulator/Event_Supplier/svc.conf
+++ b/TAO/examples/Simulator/Event_Supplier/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
-
-static Server_Strategy_Factory " -ORBdemuxstrategy dynamic -ORBtablesize 128"
-
+static Resource_Factory "-ORBresources global"
+static Client_Strategy_Factory ""
+static Server_Strategy_Factory "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile
index a1674157bab..cd9643a9357 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile
@@ -202,7 +202,16 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-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 \
@@ -224,21 +233,12 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(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/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 \
@@ -254,8 +254,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -294,7 +293,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-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 \
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
index cba9e9956a4..1da8c9c004c 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
@@ -81,12 +81,12 @@ protected:
   const char* rt_service_name;
   // The name of the Real Time Event Service.
 
-  CORBA::ORB_var orb_;
-  // The ORB that we use.
-
   PortableServer::POA_var poa_;
   // Reference to the root poa.
 
+  CORBA::ORB_var orb_;
+  // The ORB that we use.
+
   CosNaming::NamingContext_var naming_;
   // A naming context.
 
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index ea096eb1ee0..925c74dcbb8 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -198,7 +198,18 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -218,25 +229,14 @@ 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 \
- $(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/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 \
@@ -252,8 +252,7 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -292,7 +291,6 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index ce689257eb3..eb15577d4b8 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -196,7 +196,18 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -216,25 +227,14 @@ 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 \
- $(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/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 \
@@ -250,8 +250,7 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -290,7 +289,6 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 1c6c3a6b62d..93118609611 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -300,21 +300,18 @@ Event_Service::parse_args (int argc, char *argv [])
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 Event_Service::for_consumers (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ec_impl_->for_consumers (ACE_TRY_ENV);
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 Event_Service::for_suppliers (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->ec_impl_->for_suppliers (ACE_TRY_ENV);
 }
 
 void
 Event_Service::destroy (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->ec_impl_->destroy (ACE_TRY_ENV);
   ACE_CHECK;
@@ -324,10 +321,6 @@ Event_Service::destroy (CORBA::Environment &ACE_TRY_ENV)
 RtecEventChannelAdmin::Observer_Handle
 Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer,
                                 CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
   return this->ec_impl_->append_observer (observer, ACE_TRY_ENV);
 }
@@ -335,10 +328,6 @@ Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer,
 void
 Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle,
                                 CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   this->ec_impl_->remove_observer (handle, ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index 89de50f53be..b88ac45abe7 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -42,26 +42,15 @@ public:
 
   // = The RtecEventChannelAdmin::Event_Channel methods
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_consumers (CORBA::Environment &);
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void destroy (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_suppliers (CORBA::Environment &);
+  virtual void destroy (CORBA::Environment &);
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-                     CORBA::Environment &env)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+                     CORBA::Environment &env);
   virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle,
-                                CORBA::Environment &env)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+                                CORBA::Environment &env);
 
 private:
   int parse_args (int argc, char* argv[]);
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index ecdd66b354d..5b8260710f9 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -203,7 +203,18 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -223,25 +234,14 @@ 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 \
- $(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/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 \
@@ -250,8 +250,7 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -290,7 +289,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index f1528103f16..464b2a1e95a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -30,12 +30,9 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
   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_DEBUG ((LM_DEBUG,
+                "Activating Object: %s\n",
+                this->orb_manager_.orb ()->object_to_string (obj)));
 
   ACE_TRY
     {
@@ -56,9 +53,7 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
       // 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 ()),
+                                        iiop_pfile->object_key ()),
                       CORBA::Object::_nil ());
 
       mp.give_profile (new_pfile);
@@ -118,10 +113,9 @@ ImplRepo_i::activate_server (const char *server,
     {
       ACE_TRY
         {
-          CORBA::ORB_var orb = this->orb_manager_.orb ();
           CORBA::Object_var object =
-            orb->string_to_object (ping_ior,
-                                   ACE_TRY_ENV);
+            this->orb_manager_.orb ()->string_to_object (ping_ior,
+                                                         ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           Ping_Object_var ping_object = Ping_Object::_narrow (object.in (),
@@ -356,8 +350,7 @@ ImplRepo_i::server_is_running (const char *server,
   ACE_OS::strcpy (rec.host, addr.host_.in ());
   rec.port = addr.port_;
 
-  CORBA::ORB_var orb = this->orb_manager_.orb ();
-  ASYS_TCHAR *ping_ior = orb->object_to_string (ping, ACE_TRY_ENV);
+  ASYS_TCHAR *ping_ior = this->orb_manager_.orb ()->object_to_string (ping, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   ACE_NEW_RETURN (rec.ping_ior, ASYS_TCHAR[ACE_OS::strlen (ping_ior) + 1], 0);
@@ -387,7 +380,7 @@ ImplRepo_i::server_is_running (const char *server,
   // @@ 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 ();
+    this->orb_manager_.orb ()->orb_core ()->acceptor_registry ();
 
   TAO_Acceptor *acceptor = 0;
   TAO_AcceptorSetItor end = registry->end ();
@@ -481,11 +474,9 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
       if (retval != 0)
         return retval;
 
-      CORBA::ORB_var orb = this->orb_manager_.orb ();
-      PortableServer::POA_var child_poa = this->orb_manager_.child_poa ();
       ACE_NEW_RETURN (this->forwarder_impl_,
-                      IR_Forwarder (orb.in (),
-                                    child_poa.in (),
+                      IR_Forwarder (this->orb_manager_.orb (),
+                                    this->orb_manager_.child_poa (),
                                     this),
                       -1);
 
@@ -519,24 +510,19 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
       ACE_OS::fprintf (ir_file, "%s", ir_var.in ());
       ACE_OS::fclose (ir_file);
 
-      PortableServer::POAManager_var poa_manager =
-        this->orb_manager_.poa_manager ();
-
       ACE_NEW_RETURN (this->activator_,
-                      IR_Adapter_Activator (this->forwarder_impl_,
-                                            poa_manager.in ()),
+                      IR_Adapter_Activator(this->forwarder_impl_),
                       -1);
 
       PortableServer::AdapterActivator_var activator =
         this->activator_->_this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Register the Adapter_Activator reference to be the RootPOA's
+      // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
 
-      PortableServer::POA_var root_poa = this->orb_manager_.root_poa ();
-      root_poa->the_activator (activator.in (),
-                               ACE_TRY_ENV);
+      this->orb_manager_.root_poa ()->the_activator (activator.in (),
+                                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -594,10 +580,8 @@ ImplRepo_i::~ImplRepo_i (void)
     delete this->activator_;
 }
 
-IR_Adapter_Activator::IR_Adapter_Activator (IR_Forwarder *servant,
-                                            PortableServer::POAManager_ptr poa_manager)
-  : servant_ (servant),
-    poa_manager_ (PortableServer::POAManager::_duplicate (poa_manager))
+IR_Adapter_Activator::IR_Adapter_Activator (IR_Forwarder *servant)
+  : servant_ (servant)
 {
   // Nothing
 }
@@ -640,7 +624,7 @@ IR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
 
       exception_message = "While create_POA";
       PortableServer::POA_var child = parent->create_POA (name,
-                                                          this->poa_manager_.in (),
+                                                          PortableServer::POAManager::_nil (),
                                                           policies,
                                                           ACE_TRY_ENV);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
index b5d9cfb0dfc..9c3466006f0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
@@ -42,8 +42,7 @@ class IR_Adapter_Activator : public POA_PortableServer::AdapterActivator
   //    arbitrary requests.  This allows for the setting up of child
   //    POAs with default servants.
 public:
-  IR_Adapter_Activator (IR_Forwarder *servant,
-                        PortableServer::POAManager_ptr poa_manager);
+  IR_Adapter_Activator (IR_Forwarder *servant);
   // Constructor
 
   virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
@@ -56,9 +55,6 @@ public:
 private:
   IR_Forwarder *servant_;
   // The object to use as the default servant.
-
-  PortableServer::POAManager_var poa_manager_;
-  // POA Manager
 };
 
 class ImplRepo_i : public POA_Implementation_Repository
@@ -78,29 +74,29 @@ public:
 
   virtual CORBA::Object_ptr activate_object (CORBA::Object_ptr obj,
                                              CORBA_Environment &ACE_TRY_ENV
-                                               = TAO_default_environment ());
+                                               = CORBA_Environment::default_environment ());
   // 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 ());
+                                                                 CORBA::Environment &env);
   // Starts up the server <server> if not already running.
 
   virtual void register_server (const char *server,
                                 const Implementation_Repository::Process_Options &options,
                                 CORBA_Environment &ACE_TRY_ENV
-                                  = TAO_default_environment ());
+                                  = CORBA_Environment::default_environment ());
   // Adds the server to the repository and registers the startup information about
   // the server <server>.
 
   virtual void reregister_server (const char *server,
                                   const Implementation_Repository::Process_Options &options,
                                   CORBA_Environment &ACE_TRY_ENV
-                                    = TAO_default_environment ());
+                                    = CORBA_Environment::default_environment ());
   // 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::default_environment ());
   // Removes the server <server> from the repository.
 
   virtual Implementation_Repository::INET_Addr
@@ -108,20 +104,20 @@ public:
                         const Implementation_Repository::INET_Addr &addr,
                         CORBA::Object_ptr ping,
                         CORBA_Environment &ACE_TRY_ENV
-                          = TAO_default_environment ());
+                          = CORBA_Environment::default_environment ());
   // 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::default_environment ());
   // What the server should call before it shutsdown.
 
   // = Other methods
 
   int init (int argc, char **argv,
             CORBA_Environment &ACE_TRY_ENV
-              = TAO_default_environment ());
+              = CORBA_Environment::default_environment ());
   // Initialize the Server state - parsing arguments and waiting.
 
   int run (CORBA_Environment &ACE_TRY_ENV = CORBA_Environment::default_environment ());
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile
index 4784e44b5f2..1cb9c4273d1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile
@@ -218,7 +218,18 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -238,25 +249,14 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_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/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 \
@@ -272,8 +272,7 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -312,7 +311,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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 \
@@ -487,7 +485,18 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -507,25 +516,14 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_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/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 \
@@ -541,8 +539,7 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -581,7 +578,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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 \
@@ -609,10 +605,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/tao/TAO.h \
  Options.h \
  $(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 \
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index ad8cddd58a5..37666fbba22 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -26,25 +26,27 @@ Criteria_Evaluator::~Criteria_Evaluator ()
 {
 }
 
+
+
 LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *
 Criteria_Evaluator::getInitialization (CORBA::Environment &env)
 {
   LifeCycleService::Criteria_Evaluator::SeqNamedValuePair_ptr sequence_ptr = 0;
 
-  CORBA::Any *any_ptr =
-    this->getCriteriaMember ("initialization");
+  CORBA::Any * any_ptr = this->getCriteriaMember ("initialization");
 
   if (any_ptr == 0)
-    {
-      env.exception (new LifeCycleService::Criteria_Evaluator::NotAvailable ("No initialization member found.\n"));
-      return 0;
-    }
+  {
+    env.exception (new LifeCycleService::Criteria_Evaluator::NotAvailable ("No initialization member found.\n"));
+    return 0;
+  }
 
   *any_ptr >>= sequence_ptr;  
 
   return sequence_ptr;
 }
 
+
 char *
 Criteria_Evaluator::getFilter (CORBA::Environment &env)
 {
@@ -53,36 +55,35 @@ Criteria_Evaluator::getFilter (CORBA::Environment &env)
   CORBA::Any_ptr any_ptr = this->getCriteriaMember ("filter");
 
   if (any_ptr == 0)
-    {
-      env.exception (new LifeCycleService::Criteria_Evaluator::NotAvailable ("No filter member found.\n"));
-      return 0;
-    }
+  {
+    env.exception (new LifeCycleService::Criteria_Evaluator::NotAvailable ("No filter member found.\n"));
+    return 0;
+  }
   *any_ptr >>= string;
   return string;
 }
 
+
 CORBA::Any *
-Criteria_Evaluator::getCriteriaMember (const char *member_name)
+Criteria_Evaluator::getCriteriaMember (const CORBA::String member_name)
 {
   if (!ACE_OS::strcmp(member_name, "initialization")
-      && !ACE_OS::strcmp(member_name, "filter")
-      && !ACE_OS::strcmp(member_name, "logical location")
-      && !ACE_OS::strcmp(member_name, "preferences"))
+    && !ACE_OS::strcmp(member_name, "filter")
+    && !ACE_OS::strcmp(member_name, "logical location")
+    && !ACE_OS::strcmp(member_name, "preferences"))
     return 0;
 
-  for (u_int i = 0;
-       i < criteria_.length();
-       i++)
-    if (ACE_OS::strcmp (member_name,
-                        criteria_[i].name) == 0)
-      {
-        CORBA::Any_ptr value_ptr;
-        ACE_NEW_RETURN (value_ptr,
-                        CORBA::Any(criteria_[i].value),
-                        0);
-        return value_ptr;
-      }
-
+  for (unsigned int i = 0; i < criteria_.length(); i++)
+  {
+    if (ACE_OS::strcmp (member_name, criteria_[i].name) == 0)
+    {
+      CORBA::Any_ptr value_ptr;
+      ACE_NEW_RETURN (value_ptr,
+                      CORBA::Any(criteria_[i].value),
+                      0);
+      return value_ptr;
+    }
+  }
   return 0;
 }
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index 9bd63602442..c8e49e1f434 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -24,9 +24,10 @@ class Criteria_Evaluator// : public LifeCycleService::Criteria_Evaluator
 {
   // = TITLE
   //
+
 public:
-  Criteria_Evaluator (const CosLifeCycle::Criteria &criteria);
-  ~Criteria_Evaluator (void);
+  Criteria_Evaluator (const CosLifeCycle::Criteria & criteria);
+  ~Criteria_Evaluator ();
 
   LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (CORBA::Environment &_tao_environment);
 
@@ -43,7 +44,7 @@ public:
     }
 
 private:
-  CORBA::Any *getCriteriaMember (const char *member_name);
+  CORBA::Any *getCriteriaMember (const CORBA::String member_name);
 
   const CosLifeCycle::Criteria &criteria_;
 };
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile
index 3970f8cb275..82e63415687 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile
@@ -209,7 +209,18 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -229,25 +240,14 @@ 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 \
- $(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/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 \
@@ -263,8 +263,7 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -303,7 +302,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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 \
@@ -515,7 +513,18 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -535,25 +544,14 @@ 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 \
- $(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/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 \
@@ -569,8 +567,7 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -609,7 +606,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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 \
@@ -815,7 +811,18 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -835,25 +842,14 @@ 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 \
- $(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/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 \
@@ -869,8 +865,7 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -909,7 +904,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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 \
@@ -1096,7 +1090,18 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1116,25 +1121,14 @@ 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 \
- $(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/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 \
@@ -1150,8 +1144,7 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1190,7 +1183,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service_i.cpp b/TAO/orbsvcs/Logging_Service/Logging_Service_i.cpp
index 1b7dd52711a..46c2d716054 100644
--- a/TAO/orbsvcs/Logging_Service/Logging_Service_i.cpp
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service_i.cpp
@@ -5,7 +5,7 @@
 ACE_RCSID(Logging_Service, Logging_Service_i, "$Id$")
 
 Logger_Server::Logger_Server (void)
-  :service_name_ (ACE_const_cast (char *,"LoggingService"))
+  :service_name_ ("LoggingService")
 {
   // Do nothing 
 }
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service_i.h b/TAO/orbsvcs/Logging_Service/Logging_Service_i.h
index c14ba770922..e240453fcab 100644
--- a/TAO/orbsvcs/Logging_Service/Logging_Service_i.h
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service_i.h
@@ -30,7 +30,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "ace/OS.h"
 #include "tao/TAO.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile
index 307a9aa9fd0..fcb32c43251 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile
+++ b/TAO/orbsvcs/Logging_Service/Makefile
@@ -208,7 +208,16 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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 \
@@ -230,21 +239,12 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_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/Servant_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/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 \
@@ -260,8 +260,7 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -300,7 +299,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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 \
@@ -494,7 +492,16 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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 \
@@ -516,21 +523,12 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_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/Servant_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/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 \
@@ -546,8 +544,7 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -586,7 +583,6 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index 3de7195f3cb..3b6de0d0f3d 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -204,7 +204,16 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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 \
@@ -226,21 +235,12 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/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 \
@@ -256,8 +256,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -296,7 +295,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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 \
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index 6dba027ecd1..306cef39a0e 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -193,7 +193,18 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -213,25 +224,14 @@ 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 \
- $(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/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 \
@@ -247,8 +247,7 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -287,7 +286,6 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index 8c826d4872c..2a69af5411a 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -108,7 +108,7 @@ private:
   // <TimeService Clerk> object. The same instance is used by the
   // Clerk to periodically iterate through the Server Naming Context
   // and get IORs of the available servers.
-  
+
   TAO_Time_Service_Clerk *time_service_clerk_impl_;
   // Implementation of the <TimeService> Clerk object.
 
@@ -118,9 +118,6 @@ private:
   CosNaming::NamingContext_var time_service_clerk_context_;
   // Naming context for the Naming Service.
 
-  CORBA::ORB_var orb_;
-  // My orb.
-  
   int timer_value_ ;
   // Clerk seeks time periodically after this interval from the
   // servers in the network.
@@ -134,6 +131,9 @@ private:
   int ior_fp_;
   // Read IORs from a file.
 
+  CORBA::ORB_var orb_;
+  // My orb.
+
   int argc_;
   // Number of command line arguments.
 
diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile
index 5b3c1f04c0c..30799c8c6ff 100644
--- a/TAO/orbsvcs/Time_Service/Makefile
+++ b/TAO/orbsvcs/Time_Service/Makefile
@@ -227,7 +227,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -249,21 +258,12 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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/Servant_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/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 \
@@ -279,8 +279,7 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -319,7 +318,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -525,7 +523,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -547,21 +554,12 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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/Servant_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/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 \
@@ -577,8 +575,7 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -617,7 +614,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -822,7 +818,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -844,21 +849,12 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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/Servant_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/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 \
@@ -874,8 +870,7 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -914,7 +909,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -1117,7 +1111,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -1139,21 +1142,12 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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/Servant_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/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 \
@@ -1169,8 +1163,7 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1209,7 +1202,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -1413,7 +1405,16 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -1435,21 +1436,12 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_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/Servant_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/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 \
@@ -1465,8 +1457,7 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1505,7 +1496,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
@@ -1526,10 +1516,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index 759b98ff3d0..9d996a2afb2 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -72,9 +72,6 @@ public:
 
 private:
 
-  CORBA::ORB_var orb_;
-  // My orb.
-
   TAO_ORB_Manager orb_manager_;
   // The ORB manager.
 
@@ -103,6 +100,9 @@ private:
   int register_with_ir_;
   // Register with the Implementation Repository.
 
+  CORBA::ORB_var orb_;
+  // My orb.
+
   int argc_;
   // Number of command line arguments.
 
diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index 5fdd447eb93..b1ae1a1326e 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -204,7 +204,16 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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 \
@@ -226,21 +235,12 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/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 \
@@ -256,8 +256,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -296,7 +295,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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 \
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 70cea4bdc48..30204bdaa91 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -51,9 +51,9 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
   CORBA::PolicyList policy_list;
   policy_list.length (2);
   policy_list [0] =
-    PortableServer::IdUniquenessPolicy::_duplicate (idpolicy.in ());
+    PortableServer::IdUniquenessPolicy::_duplicate (idpolicy);
   policy_list [1] =
-    PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ());
+    PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy);
 
   // Create the child POA.
   this->poa_ = poa->create_POA (child_poa_name,
@@ -225,7 +225,7 @@ TAO_CosEventChannelFactory_i::destroy
         TAO_POA::string_to_ObjectId (channel_id);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in (),
+        this->poa_->id_to_reference (oid,
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -288,7 +288,7 @@ TAO_CosEventChannelFactory_i::find
         TAO_POA::string_to_ObjectId (channel_id);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in (),
+        this->poa_->id_to_reference (oid,
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
       return CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -320,7 +320,7 @@ TAO_CosEventChannelFactory_i::find_channel_id
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      return TAO_POA::ObjectId_to_string (oid.in ());
+      return TAO_POA::ObjectId_to_string (oid);
     }
   ACE_CATCH (CORBA::UserException, ue) // Translate any user exception.
     {
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 8c16736b872..0250d33633a 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -304,20 +304,20 @@ FactoryClient::run_test (CORBA::Environment &ACE_TRY_ENV)
 
   // create the first cosec
   cosec[0] = this->create_channel (channel_id[0],
-                                   this->factory_.in (),
-                                   ACE_TRY_ENV);
+                                  this->factory_,
+                                  ACE_TRY_ENV);
   ACE_CHECK;
 
  // create the second cosec
   cosec[1] = this->create_channel (channel_id[1],
-                                   this->factory_.in (),
-                                   ACE_TRY_ENV);
+                                  this->factory_,
+                                  ACE_TRY_ENV);
   ACE_CHECK;
 
   // create the third cosec
   cosec[2] = this->create_channel (channel_id[2],
-                                   this->factory_.in (),
-                                   ACE_TRY_ENV);
+                                  this->factory_,
+                                  ACE_TRY_ENV);
   ACE_CHECK;
 
   // see it we can destroy this one..
@@ -326,13 +326,13 @@ FactoryClient::run_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK;
 
   // see if we can find it?
-  this->find_channel_id (cosec[2].in (),
+  this->find_channel_id (cosec[2],
                          ACE_TRY_ENV);
   ACE_CHECK;
 
   // see if we can create it again?
   cosec[2] = this->create_channel (channel_id[2],
-                                   this->factory_.in (),
+                                   this->factory_,
                                    ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -343,47 +343,47 @@ FactoryClient::run_test (CORBA::Environment &ACE_TRY_ENV)
 
   // see if it can detect duplicates.
   this->create_channel (channel_id[2],
-                        this->factory_.in (),
+                        this->factory_,
                         ACE_TRY_ENV);
   ACE_CHECK;
 
   // see if it can give us the id?
-  this->find_channel_id (cosec[0].in (),
+  this->find_channel_id (cosec[0],
                          ACE_TRY_ENV);
   ACE_CHECK;
 
-  this->find_channel_id (cosec[1].in (),
+  this->find_channel_id (cosec[1],
                          ACE_TRY_ENV);
   ACE_CHECK;
 
-  this->find_channel_id (cosec[2].in (),
+  this->find_channel_id (cosec[2],
                          ACE_TRY_ENV);
   ACE_CHECK;
 
   // check if we can get the channels from the id.
   this->find_channel (channel_id[0],
-                      ACE_TRY_ENV);
+                     ACE_TRY_ENV);
   ACE_CHECK;
 
   this->find_channel (channel_id[1],
-                      ACE_TRY_ENV);
+                     ACE_TRY_ENV);
   ACE_CHECK;
 
   this->find_channel (channel_id[2],
-                      ACE_TRY_ENV);
+                     ACE_TRY_ENV);
   ACE_CHECK;
 
   //destroy them all.
   this->destroy_channel (channel_id[0],
-                         ACE_TRY_ENV);
+                        ACE_TRY_ENV);
   ACE_CHECK;
 
   this->destroy_channel (channel_id[1],
-                         ACE_TRY_ENV);
+                        ACE_TRY_ENV);
   ACE_CHECK;
 
   this->destroy_channel (channel_id[2],
-                         ACE_TRY_ENV);
+                        ACE_TRY_ENV);
   ACE_CHECK;
 
   // end of testing.
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
index 88803cd7c04..a3afcb1c0ec 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
@@ -235,7 +235,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -255,25 +266,14 @@ 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/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/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 \
@@ -289,8 +289,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -329,7 +328,6 @@ realclean: clean
  $(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 \
@@ -509,7 +507,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -529,25 +538,14 @@ 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/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/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 \
@@ -563,8 +561,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -603,7 +600,6 @@ realclean: clean
  $(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 \
@@ -780,7 +776,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -800,25 +807,14 @@ 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/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/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 \
@@ -834,8 +830,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -874,7 +869,6 @@ realclean: clean
  $(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 \
@@ -1086,7 +1080,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1106,25 +1111,14 @@ 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/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/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 \
@@ -1140,8 +1134,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1180,7 +1173,6 @@ realclean: clean
  $(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 \
@@ -1350,7 +1342,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1370,25 +1373,14 @@ 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/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/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 \
@@ -1404,8 +1396,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1444,7 +1435,6 @@ realclean: clean
  $(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 \
@@ -1645,7 +1635,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1665,25 +1666,14 @@ 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/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/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 \
@@ -1699,8 +1689,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1739,7 +1728,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 5fb3361fc3a..5668be63315 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -47,9 +47,6 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
 void
 TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &the_spec,
                             CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
-
 {
   if (CORBA::is_nil (this->sep_a_.in ()))
     return;
@@ -63,8 +60,6 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &the_spec,
 void
 TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
                              CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   // call start on the flow connections.
   if (CORBA::is_nil (this->sep_a_.in ()))
@@ -80,8 +75,6 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
 void
 TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &the_spec,
                                CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow))
 {
   if (CORBA::is_nil (this->sep_a_.in ()))
     return;
@@ -96,9 +89,6 @@ CORBA::Boolean
 TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos,
                                   const AVStreams::flowSpec &the_spec,
                                   CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed))
 {
   ACE_TRY
     {
@@ -122,7 +112,6 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos,
 void
 TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property & /* the_event */,
                                   CORBA::Environment & /* ACE_TRY_ENV */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,"\n(%P|%t) Recieved event \""));
 }
@@ -133,10 +122,6 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &/* the_spec */,
                                     const char  * /* fp_name */,
                                     const CORBA::Any &/* fp_settings */,
                                     CORBA::Environment &/* ACE_TRY_ENV */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::FPError))
-
 {
 }
 
@@ -144,9 +129,6 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &/* the_spec */,
 CORBA::Object_ptr
 TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name,
                                            CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::notSupported))
 {
   TAO_String_Hash_Key flow_name_key (flow_name);
   FlowConnection_Map::ENTRY *flow_connection_entry = 0;
@@ -161,9 +143,6 @@ void
 TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
                                            CORBA::Object_ptr flow_connection,
                                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::notSupported))
 {
   // add the flowname and the flowconnection to the hashtable.
   this->flows_ [this->flow_count_++] = CORBA::string_dup (flow_name);
@@ -181,7 +160,6 @@ CORBA::Boolean
 TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr remote_negotiator,
                            const AVStreams::streamQoS &qos_spec,
                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -210,10 +188,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                            AVStreams::streamQoS &the_qos,
                            const AVStreams::flowSpec &the_flows,
                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   // do a Qos Translation from application level Qos to Network level Qos??
   ACE_TRY
@@ -356,10 +330,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       AVStreams::streamQoS &the_qos,
                       const AVStreams::flowSpec &the_flows,
                       CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   this->sep_a_ = sep_a;
   this->sep_b_ = sep_b;
@@ -490,8 +460,6 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
 
 void
 TAO_StreamCtrl::unbind (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -500,9 +468,6 @@ void
 TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
                               const AVStreams::flowSpec &the_spec,
                               CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow))
 {
   ACE_UNUSED_ARG (the_ep);
   ACE_UNUSED_ARG (the_spec);
@@ -513,9 +478,6 @@ void
 TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr dev,
                             const AVStreams::flowSpec & the_spec,
                             CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow))
 {
 
 }
@@ -524,8 +486,6 @@ AVStreams::VDev_ptr
 TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
                                   AVStreams::StreamEndPoint_out sep,
                                   CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed))
 {
   return AVStreams::VDev::_nil ();
 }
@@ -534,9 +494,6 @@ CORBA::Boolean
 TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &the_qos,
                             const AVStreams::flowSpec &the_spec,
                             CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   if (this->mcastconfigif_ != 0)
     {
@@ -559,9 +516,6 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
                              AVStreams::streamQoS & the_qos,
                              const AVStreams::flowSpec & the_spec,
                              CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   return 0;
 }
@@ -569,14 +523,12 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
 void
 TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration,
                               CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties & initial,
                                               CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -584,8 +536,6 @@ void
 TAO_MCastConfigIf::set_format (const char * flowName,
                                const char * format_name,
                                CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
 }
 
@@ -593,9 +543,6 @@ void
 TAO_MCastConfigIf::set_dev_params (const char * flowName,
                                    const CosPropertyService::Properties & new_params,
                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::PropertyException,
-                   AVStreams::streamOpFailed))
 {
 }
 
@@ -631,10 +578,6 @@ TAO_Client_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                                     AVStreams::streamQoS &qos_spec,
                                     const AVStreams::flowSpec &the_spec,
                                     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   CORBA::Boolean retv = 0;
 
@@ -670,10 +613,6 @@ CORBA::Boolean
 TAO_Client_StreamEndPoint::multiconnect (AVStreams::streamQoS &the_qos,
                                          AVStreams::flowSpec &the_spec,
                                          CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow, 
-                   AVStreams::QoSRequestFailed, 
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (the_spec);
@@ -687,11 +626,6 @@ TAO_Client_StreamEndPoint::connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                          AVStreams::streamQoS &the_qos,
                                          const AVStreams::flowSpec &the_flows,
                                          CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed, 
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed, 
-                   AVStreams::notSupported))
 {
   ACE_UNUSED_ARG (the_ep);
   ACE_UNUSED_ARG (the_qos);
@@ -705,9 +639,6 @@ void
 TAO_Client_StreamEndPoint::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                             const AVStreams::flowSpec &theSpec,
                                             CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed, 
-                   AVStreams::noSuchFlow))
 {
   ACE_UNUSED_ARG (the_ep);
   ACE_UNUSED_ARG (theSpec);
@@ -736,10 +667,6 @@ TAO_Server_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                                     AVStreams::streamQoS &qos_spec,
                                     const AVStreams::flowSpec &the_spec,
                                     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (responder);
   ACE_UNUSED_ARG (qos_spec);
@@ -758,11 +685,7 @@ TAO_Server_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr ini
                                                AVStreams::streamQoS &qos,
                                                AVStreams::flowSpec &the_spec,
                                                CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpDenied,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::FPError))
+
 {
   int result = 0;
   ACE_TRY
@@ -793,11 +716,6 @@ CORBA::Boolean
 TAO_Server_StreamEndPoint::multiconnect (AVStreams::streamQoS &the_qos,
                                          AVStreams::flowSpec &the_spec,
                                          CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed, 
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed, 
-                   AVStreams::FPError))
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (the_spec);
@@ -828,8 +746,6 @@ TAO_StreamEndPoint::TAO_StreamEndPoint (void)
 void
 TAO_StreamEndPoint::stop (const AVStreams::flowSpec &the_spec,
                           CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   // Make the upcall into the app
   this->handle_stop (the_spec, ACE_TRY_ENV);
@@ -841,8 +757,6 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &the_spec,
 void
 TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec,
                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
 {
   // Make the upcall into the app
   this->handle_start (flow_spec, ACE_TRY_ENV);
@@ -852,9 +766,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec,
 
 void
 TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &the_spec,
-                             CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow))
+                                 CORBA::Environment &ACE_TRY_ENV)
 {
 //   // Make the upcall into the app
 //   this->handle_destroy (the_spec, ACE_TRY_ENV);
@@ -884,11 +796,6 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr initiator,
                                         AVStreams::streamQoS &qos,
                                         AVStreams::flowSpec &the_spec,
                                         CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpDenied,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::FPError))
 {
   ACE_UNUSED_ARG (initiator);
   ACE_UNUSED_ARG (is_mcast);
@@ -913,9 +820,6 @@ CORBA::Boolean
 TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                 const AVStreams::flowSpec &the_flows,
                                 CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (new_qos);
   ACE_UNUSED_ARG (the_flows);
@@ -928,7 +832,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
 CORBA::Boolean
 TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,
                                               CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
@@ -954,9 +857,6 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &the
 void
 TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec,
                                 CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (the_spec);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -969,9 +869,6 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &the_spec,
                                   const char *fp_name,
                                   const CORBA::Any &fp_settings,
                                   CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow,
-                   AVStreams::FPError))
 {
   ACE_UNUSED_ARG (the_spec);
   ACE_UNUSED_ARG (fp_name);
@@ -983,9 +880,6 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &the_spec,
 CORBA::Object_ptr
 TAO_StreamEndPoint::get_fep (const char *flow_name,
                              CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported,
-                   AVStreams::noSuchFlow))
 {
   TAO_String_Hash_Key fep_name_key (flow_name);
   FlowEndPoint_Map::ENTRY *fep_entry = 0;
@@ -997,10 +891,7 @@ TAO_StreamEndPoint::get_fep (const char *flow_name,
 
 char *
 TAO_StreamEndPoint::add_fep (CORBA::Object_ptr the_fep,
-                             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed))
+                                 CORBA::Environment &ACE_TRY_ENV)
 {
   char *flow_name = 0;
   ACE_TRY_EX (flow_name);
@@ -1055,9 +946,6 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr the_fep,
 void
 TAO_StreamEndPoint::remove_fep (const char *flow_name,
                                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed))
 {
   ACE_TRY
     {
@@ -1092,8 +980,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name,
 
 void
 TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
-                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                                        CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_TRY
     {
@@ -1118,7 +1005,6 @@ void
 TAO_StreamEndPoint::set_key (const char *flow_name,
                              const AVStreams::key & the_key,
                              CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
@@ -1145,7 +1031,6 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
 void
 TAO_StreamEndPoint::set_source_id (CORBA::Long source_id,
                                    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
 }
@@ -1174,10 +1059,6 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                     AVStreams::streamQoS &the_qos,
                     const AVStreams::flowSpec &the_spec,
                     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow, 
-                   AVStreams::QoSRequestFailed, 
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (the_spec);
@@ -1241,7 +1122,6 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
 CORBA::Boolean
 TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl,
                           CORBA::Environment &ACE_TRY_ENV)
-
 {
   ACE_UNUSED_ARG (media_ctrl);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -1255,10 +1135,6 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                           AVStreams::streamQoS &the_qos,
                           const AVStreams::flowSpec &the_spec,
                           CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow, 
-                   AVStreams::QoSRequestFailed, 
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (the_ctrl);
   ACE_UNUSED_ARG (a_mcastconfigif);
@@ -1272,9 +1148,6 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl,
 void
 TAO_VDev::configure (const CosPropertyService::Property &the_config_mesg,
                      CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::PropertyException, 
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (the_config_mesg);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -1285,8 +1158,6 @@ void
 TAO_VDev::set_format (const char *flowName,
                       const char *format_name,
                       CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   ACE_TRY
     {
@@ -1316,9 +1187,6 @@ void
 TAO_VDev::set_dev_params (const char *flowName,
                           const CosPropertyService::Properties &new_params,
                           CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::PropertyException, 
-                   AVStreams::streamOpFailed))
 {
   ACE_TRY
     {
@@ -1349,9 +1217,6 @@ CORBA::Boolean
 TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
                       const AVStreams::flowSpec &the_spec,
                       CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::noSuchFlow, 
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (the_spec);
@@ -1381,10 +1246,6 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
                     CORBA::Boolean_out is_met,
                     const AVStreams::flowSpec &the_spec,
                     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed, 
-                   AVStreams::noSuchFlow, 
-                   AVStreams::QoSRequestFailed))
 {
   AVStreams::StreamCtrl_ptr streamctrl (AVStreams::StreamCtrl::_nil ());
   ACE_TRY
@@ -1420,10 +1281,6 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
                           CORBA::Boolean_out is_met,
                           const AVStreams::flowSpec &the_spec,
                           CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed, 
-                   AVStreams::noSuchFlow, 
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (first_peer);
   ACE_UNUSED_ARG (the_qos);
@@ -1441,12 +1298,6 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr the_requester,
                                    char *&named_vdev,
                                    const AVStreams::flowSpec &the_spec,
                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed, 
-                   AVStreams::streamOpDenied, 
-                   AVStreams::notSupported,
-                   AVStreams::QoSRequestFailed, 
-                   AVStreams::noSuchFlow))
 {
   ACE_UNUSED_ARG (the_requester);
   ACE_UNUSED_ARG (the_qos);
@@ -1487,12 +1338,6 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr the_requester,
                         char *&named_vdev,
                         const AVStreams::flowSpec &the_spec,
                         CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed, 
-                   AVStreams::streamOpDenied, 
-                   AVStreams::notSupported,
-                   AVStreams::QoSRequestFailed, 
-                   AVStreams::noSuchFlow))
 {
   ACE_UNUSED_ARG (the_requester);
   ACE_UNUSED_ARG (the_qos);
@@ -1529,8 +1374,6 @@ void
 TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr the_ep,
                        const char *vdev_name,
                        CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
@@ -1552,9 +1395,6 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr the_ep,
 char *
 TAO_MMDevice::add_fdev (CORBA::Object_ptr the_fdev,
                         CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported, 
-                   AVStreams::streamOpFailed))
 {
   char *flow_name = 0;
   ACE_TRY_EX (flow_name)
@@ -1608,9 +1448,6 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr the_fdev,
 CORBA::Object_ptr
 TAO_MMDevice::get_fdev (const char *flow_name,
                         CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported, 
-                   AVStreams::noSuchFlow))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 
@@ -1625,9 +1462,6 @@ TAO_MMDevice::get_fdev (const char *flow_name,
 void
 TAO_MMDevice::remove_fdev (const char *flow_name,
                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported, 
-                   AVStreams::noSuchFlow))
 {
   ACE_TRY
     {
@@ -1678,7 +1512,6 @@ TAO_FlowConnection::TAO_FlowConnection (void)
 // stop this flow.
 void
 TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1686,7 +1519,6 @@ TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV)
 // start this flow.
 void
 TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1694,7 +1526,6 @@ TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV)
 // destroy this flow.
 void
 TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
@@ -1716,8 +1547,6 @@ TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV)
 CORBA::Boolean
 TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos,
                                 CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (new_qos);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -1729,9 +1558,6 @@ CORBA::Boolean
 TAO_FlowConnection::use_flow_protocol (const char * fp_name,
                                        const CORBA::Any & fp_settings,
                                        CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::FPError, 
-                   AVStreams::notSupported))
 {
   ACE_UNUSED_ARG (fp_settings);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -1742,7 +1568,6 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
 void
 TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event,
                                 CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (the_event);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -1753,10 +1578,6 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
                                   AVStreams::FDev_ptr b_party,
                                   AVStreams::QoS & the_qos,
                                   CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed, 
-                   AVStreams::streamOpDenied, 
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (a_party);
   ACE_UNUSED_ARG (b_party);
@@ -1771,10 +1592,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr flow_producer,
                              AVStreams::FlowConsumer_ptr flow_consumer,
                              AVStreams::QoS & the_qos,
                              CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::formatMismatch, 
-                   AVStreams::FEPMismatch, 
-                   AVStreams::alreadyConnected))
 {
   ACE_TRY
     {
@@ -1819,7 +1636,6 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr flow_producer,
 
 CORBA::Boolean
 TAO_FlowConnection::disconnect (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   return  0;
@@ -1829,9 +1645,6 @@ CORBA::Boolean
 TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr flow_producer,
                                   AVStreams::QoS & the_qos,
                                   CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::alreadyConnected,
-                   AVStreams::notSupported))
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -1843,8 +1656,6 @@ CORBA::Boolean
 TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
                                   AVStreams::QoS & the_qos,
                                   CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::alreadyConnected))
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -1855,8 +1666,6 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
 CORBA::Boolean
 TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target,
                           CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notConnected))
 {
   ACE_UNUSED_ARG (target);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -1878,7 +1687,6 @@ TAO_FlowEndPoint::TAO_FlowEndPoint (void)
 // the same flowendpoint.
 CORBA::Boolean
 TAO_FlowEndPoint::lock (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // lock the current flowendpoint
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -1888,7 +1696,6 @@ TAO_FlowEndPoint::lock (CORBA::Environment &ACE_TRY_ENV)
 // unlocks the flowendpoint ,becomes free to be used in another flow.
 void
 TAO_FlowEndPoint::unlock (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
@@ -1896,21 +1703,18 @@ TAO_FlowEndPoint::unlock (CORBA::Environment &ACE_TRY_ENV)
 // The start,stop and destroy are to be handled by the application.
 void
 TAO_FlowEndPoint::stop (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void
 TAO_FlowEndPoint::start (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void
 TAO_FlowEndPoint::destroy (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
@@ -1930,7 +1734,6 @@ TAO_FlowEndPoint::destroy (CORBA::Environment &ACE_TRY_ENV)
 
 AVStreams::StreamEndPoint_ptr
 TAO_FlowEndPoint::related_sep (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   return this->related_sep_;
@@ -1939,7 +1742,6 @@ TAO_FlowEndPoint::related_sep (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep,
                                CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   this->related_sep_ = related_sep;
@@ -1947,7 +1749,6 @@ TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep,
 
 AVStreams::FlowConnection_ptr
 TAO_FlowEndPoint::related_flow_connection (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   return this->related_flow_connection_;
@@ -1956,7 +1757,6 @@ TAO_FlowEndPoint::related_flow_connection (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection,
                                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   this->related_flow_connection_ = related_flow_connection;
@@ -1965,9 +1765,6 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related
 // returns the connected peer for this flow
 AVStreams::FlowEndPoint_ptr
 TAO_FlowEndPoint::get_connected_fep (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notConnected,
-                   AVStreams::notSupported))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   return this->peer_fep_;
@@ -1977,9 +1774,6 @@ CORBA::Boolean
 TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
                                      const CORBA::Any & fp_settings,
                                      CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::FPError, 
-                   AVStreams::notSupported))
 {
   ACE_UNUSED_ARG (fp_settings);
   ACE_TRY
@@ -2005,8 +1799,6 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
 void
 TAO_FlowEndPoint::set_format (const char * format,
                               CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   ACE_TRY
     {
@@ -2030,9 +1822,6 @@ TAO_FlowEndPoint::set_format (const char * format,
 void
 TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings,
                                   CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::PropertyException, 
-                   AVStreams::streamOpFailed))
 {
   ACE_TRY
     {
@@ -2054,8 +1843,8 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set
 void
 TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & the_spec,
                                             CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
+
+
 {
   ACE_TRY
     {
@@ -2077,9 +1866,6 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & the_
 CORBA::Boolean
 TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep,
                                      CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::formatMismatch, 
-                   AVStreams::deviceQosMismatch))
 {
   ACE_TRY
     {
@@ -2144,9 +1930,6 @@ TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr the_fc,
                             AVStreams::FlowEndPoint_ptr the_peer_fep,
                             AVStreams::QoS & the_qos,
                             CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::QoSRequestFailed,
-                   AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (the_fc);
   ACE_UNUSED_ARG (the_peer_fep);
@@ -2162,8 +1945,6 @@ TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
                                   AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                   AVStreams::QoS & the_qos,
                                   CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (the_fc);
   ACE_UNUSED_ARG (a_mcastconfigif);
@@ -2178,10 +1959,6 @@ TAO_FlowEndPoint::go_to_listen (AVStreams::QoS & the_qos,
                                AVStreams::FlowProducer_ptr peer,
                                char *& flowProtocol,
                                CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToListen, 
-                   AVStreams::FPError, 
-                   AVStreams::QoSRequestFailed))
 {
   return this->handle_go_to_listen (the_qos,is_mcast,peer,flowProtocol,ACE_TRY_ENV);
 }
@@ -2207,10 +1984,6 @@ TAO_FlowEndPoint::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
                                    const char * use_flow_protocol,
                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToConnect,
-                   AVStreams::FPError, 
-                   AVStreams::QoSRequestFailed))
 {
   // Right now since the A/V framework doesnt bother about the
   // protocols we leave it to the application to handle the connection
@@ -2251,11 +2024,6 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & the_qos,
                                            const char * address,
                                            const char * use_flow_protocol,
                                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::failedToConnect,
-                   AVStreams::notSupported,
-                   AVStreams::FPError,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
@@ -2269,7 +2037,6 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & the_qos,
 char *
 TAO_FlowProducer::get_rev_channel (const char * pcol_name,
                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (pcol_name);
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -2280,7 +2047,6 @@ TAO_FlowProducer::get_rev_channel (const char * pcol_name,
 void
 TAO_FlowProducer::set_key (const AVStreams::key & the_key,
                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
@@ -2303,7 +2069,6 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key,
 void
 TAO_FlowProducer::set_source_id (CORBA::Long source_id,
                                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   this->source_id_ = source_id;
@@ -2336,11 +2101,6 @@ TAO_FDev::create_producer (AVStreams::FlowConnection_ptr the_requester,
                            CORBA::Boolean_out met_qos,
                            char *& named_fdev,
                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::streamOpDenied,
-                   AVStreams::notSupported,
-                   AVStreams::QoSRequestFailed))
 {
   // call the bridge method.
   this->producer_ = this->make_producer (the_requester,
@@ -2399,11 +2159,6 @@ TAO_FDev::create_consumer (AVStreams::FlowConnection_ptr the_requester,
                            CORBA::Boolean_out met_qos,
                            char *& named_fdev,
                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::streamOpDenied,
-                   AVStreams::notSupported,
-                   AVStreams::QoSRequestFailed))
 {
   this->consumer_ = this->make_consumer (the_requester,
                                          the_qos,
@@ -2419,9 +2174,6 @@ TAO_FDev::bind (AVStreams::FDev_ptr peer_device,
                 AVStreams::QoS & the_qos,
                 CORBA::Boolean_out is_met,
                 CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (peer_device);
   ACE_UNUSED_ARG (the_qos);
@@ -2436,9 +2188,6 @@ TAO_FDev::bind_mcast (AVStreams::FDev_ptr first_peer,
                       AVStreams::QoS & the_qos,
                       CORBA::Boolean_out is_met,
                       CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (first_peer);
   ACE_UNUSED_ARG (the_qos);
@@ -2451,8 +2200,6 @@ void
 TAO_FDev::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */,
                    const char * /* fdev_name */,
                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::notSupported))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 1a871277da6..abcf1e9568a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -56,82 +56,62 @@ class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl
   : public virtual POA_AVStreams::Basic_StreamCtrl,
     public virtual TAO_PropertySet,
     public virtual PortableServer::RefCountServantBase
+// = DESCRIPTION
+//    Base class for StreamCtrl, implements basic stream start
+//    and stop functionality
 {
-  // = DESCRIPTION
-  //    Base class for StreamCtrl, implements basic stream start
-  //    and stop functionality
-
-public:
+ public:
   TAO_Basic_StreamCtrl (void);
   // Default Constructor
 
   virtual void stop (const AVStreams::flowSpec &the_spec,
-                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+                     CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Stop the transfer of data of the stream
   // Empty the_spec means apply operation to all flows
 
   virtual void start (const AVStreams::flowSpec &the_spec,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+                      CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Start the transfer of data in the stream.
   // Empty the_spec means apply operation to all flows
 
   virtual void destroy (const AVStreams::flowSpec &the_spec,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+                        CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Tears down the stream. This will close the connection, and delete
   // the streamendpoint and vdev associated with this stream
   // Empty the_spec means apply operation to all flows
 
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                                      const AVStreams::flowSpec &the_spec,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Changes the QoS associated with the stream
   // Empty the_spec means apply operation to all flows
 
   virtual void push_event (const struct CosPropertyService::Property & the_event,  
-                           CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used by StreamEndPoint and VDev to inform StreamCtrl of events.
   // E.g., loss of flow, reestablishment of flow, etc..
 
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
                              const CORBA::Any &fp_settings,
-                             CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::FPError));
+                             CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used to control the flow protocol parameters.
 
   virtual CORBA::Object_ptr get_flow_connection (const char *flow_name,
-                                                 CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::notSupported));
+                                                 CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Not implemented in the light profile, will raise the notsupported
   // exception
 
   virtual void set_flow_connection (const char *flow_name,
                                     CORBA::Object_ptr flow_connection,
-                                    CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::notSupported));
+                                    CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Not implemented in the light profile, will raise the notsupported
   // exception
 
   virtual ~TAO_Basic_StreamCtrl (void);
   // Destructor
 
-protected:
+ protected:
 
   AVStreams::VDev_var vdev_a_;
   AVStreams::VDev_var vdev_b_;
@@ -158,8 +138,7 @@ class TAO_ORBSVCS_Export TAO_Negotiator
 public:
   virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator,
                                     const AVStreams::streamQoS &qos_spec,
-                                    CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
 };
 
 class TAO_MCastConfigIf;
@@ -181,11 +160,7 @@ public:
                                     AVStreams::MMDevice_ptr b_party,
                                     AVStreams::streamQoS &the_qos,
                                     const AVStreams::flowSpec &the_flows,
-                                    CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                    CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Establish a stream between a_party and b_party,
   // with qos the_qos, and for the flows in the_flows
   // if the_flows is empty, bind all the flows
@@ -196,47 +171,30 @@ public:
                                AVStreams::StreamEndPoint_B_ptr b_party,
                                AVStreams::streamQoS &the_qos,
                                const AVStreams::flowSpec &the_flows,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ())
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   AVStreams::streamOpFailed,
-                   AVStreams::noSuchFlow,
-                   AVStreams::QoSRequestFailed));
+                               CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Establish a connection between two streamendpoints. This can
   // be used if the streamendpoints have been created independent of
   // a MMDevice
 
-  virtual void unbind_dev (AVStreams::MMDevice_ptr dev,
-                           const AVStreams::flowSpec & the_spec,
-                           CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow));
-
   virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
                              const AVStreams::flowSpec &the_spec,
-                             CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::noSuchFlow));
+                             CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Unbind the_ep from the stream. Empty the_spec means apply to all flows.
 
-  virtual void unbind (CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed));
+  virtual void unbind (CORBA::Environment &env = CORBA::Environment::default_environment ());
   // unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
 
+  virtual void unbind_dev (AVStreams::MMDevice_ptr dev,
+                           const AVStreams::flowSpec & the_spec,
+                           CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
+
   virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
                                                 AVStreams::StreamEndPoint_out sep,
-                                                CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed));
+                                                CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
 
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                                      const AVStreams::flowSpec &the_spec,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Changes the QoS associated with the stream
   // Empty the_spec means apply operation to all flows
 
@@ -257,44 +215,34 @@ public:
   virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
                                    AVStreams::streamQoS & the_qos,
                                    const AVStreams::flowSpec & the_spec,
-                                   CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                   CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) ;
 
   virtual void configure (const CosPropertyService::Property & a_configuration,
-                          CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
-  ACE_THROW_SPEC ((CORBA::SystemException));
+                          CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) ;
 
   virtual void set_initial_configuration (const CosPropertyService::Properties & initial,
-                                          CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                          CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) ;
 
   virtual void set_format (const char * flowName,
                            const char * format_name,
                            CORBA::Environment &ACE_TRY_ENV = 
-                           CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                           CORBA::Environment::default_environment ()) ;
 
   virtual void set_dev_params (const char * flowName,
                                const CosPropertyService::Properties & new_params,
-                               CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::PropertyException,
-                     AVStreams::streamOpFailed));
-  
+                               CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) ;
+
 protected:
   ACE_SOCK_Dgram_Mcast sock_mcast_;
   // Multicast socket.
 };
 
 class TAO_ORBSVCS_Export TAO_Base_StreamEndPoint
+// = DESCRIPTION
+//    Base class for the A/V StreamEndPoint class. this class
+//    is used to control the stream. It should be subclassed
+//    by applications that want to provide more control features.
 {
-  // = DESCRIPTION
-  //    Base class for the A/V StreamEndPoint class. this class
-  //    is used to control the stream. It should be subclassed
-  //    by applications that want to provide more control features.
 public:
   virtual ~TAO_Base_StreamEndPoint (void);
 
@@ -352,110 +300,73 @@ public:
   // Constructor
 
   virtual void stop (const AVStreams::flowSpec &the_spec,
-                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+                     CORBA::Environment &env = CORBA::Environment::default_environment ());
    // Stop the stream. Empty the_spec means, for all the flows
 
   virtual void start (const AVStreams::flowSpec &the_spec,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+                      CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Start the stream, Empty the_spec means, for all the flows
 
   virtual void destroy (const AVStreams::flowSpec &the_spec,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow));
+                        CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Destroy the stream, Empty the_spec means, for all the flows
 
   virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
                                   AVStreams::streamQoS &qos_spec,
                                   const AVStreams::flowSpec &the_spec,
-                                  CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed)) = 0;
+                                  CORBA::Environment &env = CORBA::Environment::default_environment ()) = 0;
   // Called by StreamCtrl. responder is the peer to connect to
 
   virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
                                              CORBA::Boolean is_mcast,
                                              AVStreams::streamQoS &qos,
                                              AVStreams::flowSpec &the_spec,
-                                             CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpDenied,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::FPError));
+                                             CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Called by the peer StreamEndPoint. The flow_spec indicates the
   // flows (which contain transport addresses etc.)
 
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                                      const AVStreams::flowSpec &the_flows,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed));
+                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Change the transport qos on a stream
 
   virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,
-                                                   CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                                   CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used to restrict the set of protocols
 
   virtual void disconnect (const AVStreams::flowSpec &the_spec,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::streamOpFailed));
+                           CORBA::Environment &env = CORBA::Environment::default_environment ());
   // disconnect the flows
 
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
                              const CORBA::Any &fp_settings,
-                             CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::FPError));
+                             CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used to control the flow
 
   virtual CORBA::Object_ptr get_fep (const char *flow_name,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::noSuchFlow));
+                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Not implemented in the light profile, throws notsupported
 
   virtual char * add_fep (CORBA::Object_ptr the_fep,
-                          CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed));
+                          CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Not implemented in the light profile, throws notsupported
 
   virtual void remove_fep (const char *fep_name,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported,
-                     AVStreams::streamOpFailed));
+                           CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Not implemented in the light profile, throws notsupported
 
   virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                               CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used to "attach" a negotiator to the endpoint
 
   virtual void set_key (const char *flow_name,
                         const AVStreams::key & the_key,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used for public key encryption.
 
   virtual void set_source_id (CORBA::Long source_id,
-                              CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used to set a unique id for packets sent by this streamendpoint
 
   virtual ~TAO_StreamEndPoint (void);
@@ -493,39 +404,23 @@ public:
   virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
                                   AVStreams::streamQoS &qos_spec,
                                   const AVStreams::flowSpec &the_spec,
-                                  CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                  CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Called by StreamCtrl. responder is the peer to connect to
 
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
                                        AVStreams::flowSpec &the_spec,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow, 
-                     AVStreams::QoSRequestFailed, 
-                     AVStreams::streamOpFailed));
+                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used for ATM-style multicast
 
   virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                        AVStreams::streamQoS &the_qos,
                                        const AVStreams::flowSpec &the_flows,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed, 
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed, 
-                     AVStreams::notSupported));
+                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used for ATM-style multicast
 
   virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                 const AVStreams::flowSpec &theSpec,
-                                CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed, 
-                     AVStreams::noSuchFlow));
+                                CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used to remove a multicast leaf
 
   virtual ~TAO_Client_StreamEndPoint (void);
@@ -548,33 +443,19 @@ public:
   virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
                                   AVStreams::streamQoS &qos_spec,
                                   const AVStreams::flowSpec &the_spec,
-                                  CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                  CORBA::Environment &env = CORBA::Environment::default_environment ());
 
   virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
                                              CORBA::Boolean is_mcast,
                                              AVStreams::streamQoS &qos,
                                              AVStreams::flowSpec &the_spec,
-                                             CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpDenied,
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::FPError));
+                                             CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Called by the peer StreamEndPoint. The flow_spec indicates the
   // flows (which contain transport addresses etc.)
 
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
                                        AVStreams::flowSpec &the_spec,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed, 
-                     AVStreams::noSuchFlow,
-                     AVStreams::QoSRequestFailed, 
-                     AVStreams::FPError));
+                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used for internet-style multicast
 
   virtual ~TAO_Server_StreamEndPoint (void);
@@ -597,52 +478,33 @@ class TAO_ORBSVCS_Export TAO_VDev
                                    AVStreams::VDev_ptr the_peer_dev,
                                    AVStreams::streamQoS &the_qos,
                                    const AVStreams::flowSpec &the_spec,
-                                   CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow, 
-                     AVStreams::QoSRequestFailed, 
-                     AVStreams::streamOpFailed));
+                                   CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Called to tell the vdev who the streamctrl, peer vdev is
 
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                          AVStreams::streamQoS &the_qos,
                                          const AVStreams::flowSpec &the_spec,
-                                         CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow, 
-                     AVStreams::QoSRequestFailed, 
-                     AVStreams::streamOpFailed));
+                                         CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used to set the streamctrl and multicast device
 
   virtual void configure (const CosPropertyService::Property &the_config_mesg,
-                          CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::PropertyException, 
-                     AVStreams::streamOpFailed));
+                          CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Called by the peer VDev to configure the device (catch all)
 
   virtual void set_format (const char *flowName,
                            const char *format_name,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                           CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used to set a format on a flowname
 
   virtual void set_dev_params (const char *flowName,
                                const CosPropertyService::Properties &new_params,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::PropertyException, 
-                     AVStreams::streamOpFailed));
+                               CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Used to set device parameters
 
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos,
                                      const AVStreams::flowSpec &the_spec,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::noSuchFlow, 
-                     AVStreams::QoSRequestFailed));
+                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Called to change QoS of the device
 
   virtual ~TAO_VDev (void);
@@ -682,11 +544,7 @@ class TAO_ORBSVCS_Export TAO_MMDevice
                                            AVStreams::streamQoS &the_qos,
                                            CORBA::Boolean_out is_met,
                                            const AVStreams::flowSpec &the_spec,
-                                           CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed, 
-                     AVStreams::noSuchFlow, 
-                     AVStreams::QoSRequestFailed));
+                                           CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Can be used to request the MMDevice to create a new StreamCtrl,
   // and call bind_devs on it
 
@@ -694,11 +552,7 @@ class TAO_ORBSVCS_Export TAO_MMDevice
                                                  AVStreams::streamQoS &the_qos,
                                                  CORBA::Boolean_out is_met,
                                                  const AVStreams::flowSpec &the_spec,
-                                                 CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed, 
-                     AVStreams::noSuchFlow, 
-                     AVStreams::QoSRequestFailed));
+                                                 CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Multicast bind
 
   virtual AVStreams::StreamEndPoint_A_ptr  create_A (AVStreams::StreamCtrl_ptr the_requester,
@@ -707,13 +561,7 @@ class TAO_ORBSVCS_Export TAO_MMDevice
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
                                                      const AVStreams::flowSpec &the_spec,
-                                                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed, 
-                     AVStreams::streamOpDenied, 
-                     AVStreams::notSupported,
-                     AVStreams::QoSRequestFailed, 
-                     AVStreams::noSuchFlow));
+                                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Called by StreamCtrl to create a "A" type streamandpoint and vdev
 
   virtual AVStreams::StreamEndPoint_B_ptr  create_B (AVStreams::StreamCtrl_ptr the_requester,
@@ -722,41 +570,24 @@ class TAO_ORBSVCS_Export TAO_MMDevice
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
                                                      const AVStreams::flowSpec &the_spec,
-                                                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed, 
-                     AVStreams::streamOpDenied, 
-                     AVStreams::notSupported,
-                     AVStreams::QoSRequestFailed, 
-                     AVStreams::noSuchFlow));
+                                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Called by StreamCtrl to create a "B" type streamandpoint and vdev
 
   virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep,
                         const char *vdev_name,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                        CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Remove the StreamEndPoint and the related vdev
 
   virtual char * add_fdev (CORBA::Object_ptr the_fdev,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported, 
-                     AVStreams::streamOpFailed));
+                           CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Not supported in the light profile, raises notsupported
 
   virtual CORBA::Object_ptr get_fdev (const char *flow_name,
-                                      CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported, 
-                     AVStreams::noSuchFlow));
+                                      CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Not supported in the light profile, raises notsupported
 
   virtual void remove_fdev (const char *flow_name,
-                            CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported, 
-                     AVStreams::noSuchFlow));
+                            CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Not supported in the light profile, raises notsupported
 
   virtual ~TAO_MMDevice (void);
@@ -795,81 +626,56 @@ public:
   TAO_FlowConnection (void);
   // default constructor.
 
-  virtual void stop (CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void stop (CORBA::Environment &env = CORBA::Environment::default_environment ());
   // stop this flow.
 
-  virtual void start (CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void start (CORBA::Environment &env = CORBA::Environment::default_environment ());
   // start this flow.
 
-  virtual void destroy (CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (CORBA::Environment &env = CORBA::Environment::default_environment ());
   // destroy this flow.
 
   virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::QoSRequestFailed));
+                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
   // modify the QoS for this flow.
 
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
                                             const CORBA::Any & fp_settings,
-                                            CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::FPError, 
-                     AVStreams::notSupported));
+                                            CORBA::Environment &env = CORBA::Environment::default_environment ());
   // use the specified flow protocol for this flow.
 
   virtual void push_event (const AVStreams::streamEvent & the_event,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           CORBA::Environment &env = CORBA::Environment::default_environment ());
 
   // pushes an event , to be handled by the application.
 
   virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party,
                                        AVStreams::FDev_ptr b_party,
                                        AVStreams::QoS & the_qos,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed, 
-                     AVStreams::streamOpDenied, 
-                     AVStreams::QoSRequestFailed));
+                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
   // connect 2 Flow Devices.
  
   virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer,
                                   AVStreams::FlowConsumer_ptr flow_consumer,
                                   AVStreams::QoS & the_qos,
-                                  CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::formatMismatch, 
-                     AVStreams::FEPMismatch, 
-                     AVStreams::alreadyConnected));
+                                  CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Connect a flow producer and consumer under this flow connection.
 
-  virtual CORBA::Boolean disconnect (CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean disconnect (CORBA::Environment &env = CORBA::Environment::default_environment ());
   // disconnect this flow connection.
 
   virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer,
                                        AVStreams::QoS & the_qos,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::alreadyConnected,
-                     AVStreams::notSupported));
+                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
   // adds the producer to this flow connection.
  
   virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
                                        AVStreams::QoS & the_qos,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::alreadyConnected));
+                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
   // adds a consumer to this flow connection.
 
   virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notConnected));
+                               CORBA::Environment &env = CORBA::Environment::default_environment ());
   // drops a flow endpoint from the flow.
 
 protected:
@@ -896,111 +702,83 @@ class TAO_ORBSVCS_Export TAO_FlowEndPoint :
   //default constructor.
 
   virtual CORBA::Boolean lock (CORBA::Environment &env =
-                               CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                               CORBA::Environment::default_environment ());
   // lock the flow endpoint for a particular flow.
 
   virtual void unlock (CORBA::Environment &env =
-                       CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                       CORBA::Environment::default_environment ());
   // unlock the flow endpoint for subsequent use.
 
   virtual void stop (CORBA::Environment &env =
-                     CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment::default_environment ());
   // stop this flow, to be overridden by the application.  
 
   virtual void start (CORBA::Environment &env =
-                      CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Environment::default_environment ());
   // start this flow, to be overridden by the application.
 
   virtual void destroy (CORBA::Environment &env =
-                        CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        CORBA::Environment::default_environment ());
   // destroy this flow.
 
-  virtual AVStreams::StreamEndPoint_ptr related_sep(CORBA::Environment &env = 
-                                                    CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual AVStreams::StreamEndPoint_ptr related_sep
+    (CORBA::Environment &env = 
+     CORBA::Environment::default_environment ());
   // get method for the related streamendpoint under which this
   // flowendpoint is.
 
   virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep,
                             CORBA::Environment &env = 
-                            CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                            CORBA::Environment::default_environment ());
   // set method for the related streamendpoint under which this
   // flowendpoint is.
 
   virtual AVStreams::FlowConnection_ptr related_flow_connection(CORBA::Environment &env = 
-                                                                CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                                                CORBA::Environment::default_environment ());
 
   // accessor for the related flow connection attribute.
 
   virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection,
-                                        CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                        CORBA::Environment &env = CORBA::Environment::default_environment ());
   // set method for the related flow connection attribute.
 
-  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (CORBA::Environment &env = 
-                                                         CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notConnected,
-                     AVStreams::notSupported));
+  virtual AVStreams::FlowEndPoint_ptr get_connected_fep
+    (CORBA::Environment &env = 
+     CORBA::Environment::default_environment ());
   // returns the other flowendpoint to which this is connected.
 
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
                                             const CORBA::Any & fp_settings,
-                                            CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::FPError, 
-                     AVStreams::notSupported));
+                                            CORBA::Environment &env = CORBA::Environment::default_environment ());
   /// use the specified flow protocol.
 
   virtual void set_format (const char * format,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                           CORBA::Environment &env = CORBA::Environment::default_environment ());
   // sets the data format.
 
   virtual void set_dev_params (const CosPropertyService::Properties & new_settings,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::PropertyException, 
-                     AVStreams::streamOpFailed));
+                               CORBA::Environment &env = CORBA::Environment::default_environment ());
   // sets the device parameters.
 
   virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec,
-                                         CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                                         CORBA::Environment &env = CORBA::Environment::default_environment ());
   // sets the list of protocols to be used.
 
   virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep,
-                                            CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::formatMismatch, 
-                     AVStreams::deviceQosMismatch));
+                                            CORBA::Environment &env = CORBA::Environment::default_environment ());
   // checks whether the passed flowendpoint is compatible with this.
 
   virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc,
                                    AVStreams::FlowEndPoint_ptr the_peer_fep,
                                    AVStreams::QoS & the_qos,
-                                   CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::QoSRequestFailed,
-                     AVStreams::streamOpFailed));
+                                   CORBA::Environment &env = CORBA::Environment::default_environment ());
   // sets the peer flowendpoint.
 
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                          AVStreams::QoS & the_qos,
                                          CORBA::Environment &env =
-                                         CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::QoSRequestFailed));
+                                         CORBA::Environment::default_environment ());
   // sets the multicast peer flowendpoint, not implemented.
 
 
@@ -1008,11 +786,7 @@ class TAO_ORBSVCS_Export TAO_FlowEndPoint :
                                           const char * address,
                                           const char * use_flow_protocol,
                                           CORBA::Environment &env =
-                                          CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToConnect,
-                     AVStreams::FPError, 
-                     AVStreams::QoSRequestFailed));
+                                          CORBA::Environment::default_environment ());
   // connect to the peer endpoint.
 
   virtual CORBA::Boolean handle_connect_to_peer (AVStreams::QoS & the_qos,
@@ -1020,6 +794,7 @@ class TAO_ORBSVCS_Export TAO_FlowEndPoint :
                                                  const char * use_flow_protocol,
                                                  CORBA::Environment &env =
                                                  CORBA::Environment::default_environment ());
+
   // hook method to be overridden by the application to handle the connection request.
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
@@ -1027,11 +802,8 @@ class TAO_ORBSVCS_Export TAO_FlowEndPoint :
                                AVStreams::FlowProducer_ptr peer,
                                char *& flowProtocol,
                                CORBA::Environment &env =
-                               CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToListen, 
-                     AVStreams::FPError, 
-                     AVStreams::QoSRequestFailed));
+                               CORBA::Environment::default_environment
+                               ());
 
   // listen request from the peer.
 
@@ -1039,7 +811,9 @@ class TAO_ORBSVCS_Export TAO_FlowEndPoint :
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowProducer_ptr peer,
                                char *& flowProtocol,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ()); 
+                               CORBA::Environment &env =
+                               CORBA::Environment::default_environment
+                               ());
   // applications should override this method.
 
 protected:
@@ -1059,33 +833,26 @@ class TAO_ORBSVCS_Export TAO_FlowProducer:
   public:
   TAO_FlowProducer (void);
   // default constructor
-
   virtual char * connect_mcast (AVStreams::QoS & the_qos,
                                 CORBA::Boolean_out is_met,
                                 const char * address,
                                 const char * use_flow_protocol,
-                                CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::failedToConnect,
-                     AVStreams::notSupported,
-                     AVStreams::FPError,
-                     AVStreams::QoSRequestFailed));
+                                CORBA::Environment &env = CORBA::Environment::default_environment ());
 
   // connect to the multicast address, not implemented.
 
   virtual char * get_rev_channel (const char * pcol_name,
-                                  CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                  CORBA::Environment &env = CORBA::Environment::default_environment ());
   // get the reverse channel, to be used for feedback for protocols like UDP.
 
   virtual void set_key (const AVStreams::key & the_key,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                        CORBA::Environment &env = CORBA::Environment::default_environment ());
   // sets the public key  to be used for encryption of the data.
 
   virtual void set_source_id (CORBA::Long source_id,
-                              CORBA::Environment &env =CORBA::Environment::default_environment()) 
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              CORBA::Environment &env =
+                              CORBA::Environment::default_environment
+                              ());
   // sets the source id of this flow producer so that it can be used
   // to distinguish this producer from others in the multicast case.
 
@@ -1119,12 +886,7 @@ class TAO_ORBSVCS_Export TAO_FDev :
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
                                                        char *& named_fdev,
-                                                       CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::streamOpDenied,
-                     AVStreams::notSupported,
-                     AVStreams::QoSRequestFailed));
+                                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
   // create a flow producer object.
 
   virtual AVStreams::FlowProducer_ptr make_producer (AVStreams::FlowConnection_ptr the_requester,
@@ -1139,46 +901,33 @@ class TAO_ORBSVCS_Export TAO_FDev :
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
                                                        char *& named_fdev,
-                                                       CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::streamOpDenied,
-                     AVStreams::notSupported,
-                     AVStreams::QoSRequestFailed));
+                                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
   // create a flow consumer object.
 
   virtual AVStreams::FlowConsumer_ptr make_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
                                                        char *& named_fdev,
-                                                       CORBA::Environment &env = CORBA::Environment::default_environment ()); 
+                                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
   // bridge method for the application to override the consumer object
   // creation. Default implementation creates a TAO_FlowConsumer.
 
   virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device,
                                               AVStreams::QoS & the_qos,
                                               CORBA::Boolean_out is_met,
-                                              CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::QoSRequestFailed));
+                                              CORBA::Environment &env = CORBA::Environment::default_environment ());
   // bind this FDev with another FDev.
 
   virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer,
                                                     AVStreams::QoS & the_qos,
                                                     CORBA::Boolean_out is_met,
-                                                    CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::streamOpFailed,
-                     AVStreams::QoSRequestFailed));
+                                                    CORBA::Environment &env = CORBA::Environment::default_environment ());
   // multicast bind is not implemented yet.
 
   virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep,
                         const char * fdev_name,
                         CORBA::Environment &env =
-                        CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::notSupported));
+                        CORBA::Environment::default_environment ());
   // destroys this FDev.
 
 protected:
@@ -1203,35 +952,22 @@ class TAO_ORBSVCS_Export TAO_MediaControl
 
   virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin,
                                                   AVStreams::PositionKey a_key,
-                                                  CORBA::Environment &env = CORBA::Environment::default_environment ()) 
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::MediaControl::PostionKeyNotSupported)) =0;
+                                                  CORBA::Environment &env = CORBA::Environment::default_environment ()) =0;
 
   virtual void set_media_position (const AVStreams::Position & a_position,
-                                   CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::MediaControl::PostionKeyNotSupported,
-                     AVStreams::InvalidPosition)) =0;
+                                   CORBA::Environment &env = CORBA::Environment::default_environment ()) =0;
 
   virtual void start (const AVStreams::Position & a_position,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::InvalidPosition)) =0;
+                      CORBA::Environment &env = CORBA::Environment::default_environment ()) =0;
 
   virtual void pause (const AVStreams::Position & a_position,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::InvalidPosition)) =0;
+                      CORBA::Environment &env = CORBA::Environment::default_environment ()) =0;
 
   virtual void resume (const AVStreams::Position & a_position,
-                       CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::InvalidPosition)) =0;
+                       CORBA::Environment &env = CORBA::Environment::default_environment ()) =0;
 
   virtual void stop (const AVStreams::Position & a_position,
-                     CORBA::Environment &env = CORBA::Environment::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     AVStreams::InvalidPosition)) =0;
+                     CORBA::Environment &env = CORBA::Environment::default_environment ()) = 0;
 
 };
 
@@ -1350,11 +1086,11 @@ public:
 // class TAO_ORBSVCS_Export TAO_AV_QoS
 // {
 // public:
-//   TAO_AV_QoS (void) ACE_THROW_SPEC ((CORBA::SystemException));
+//   TAO_AV_QoS (void);
 //   // constructor.
 
 //   int convert (const AVStreams::streamQoS &application_qos,
-//                AVStreams::streamQoS &network_qos) ACE_THROW_SPEC ((CORBA::SystemException));
+//                AVStreams::streamQoS &network_qos);
 //   // converts the application level QoS to Network-level QoS.
 // };
 
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/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index 4120f0a3aca..61057fea1b2 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -13,25 +13,19 @@ ACE_RCSID(orbsvcs, Channel_Clients_T, "$Id$")
 
 template<class TARGET> void
 ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events,
-                                        CORBA::Environment &TAO_IN_ENV)
-      ACE_THROW_SPEC (( CORBA::SystemException))
+					CORBA::Environment &TAO_IN_ENV)
 {
   target_->push (events, TAO_IN_ENV);
 }
 
 template<class TARGET> void
-ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (
-    CORBA::Environment &TAO_IN_ENV)
-      ACE_THROW_SPEC (( CORBA::SystemException))
+ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (CORBA::Environment &TAO_IN_ENV)
 {
-
   target_->disconnect_push_consumer (TAO_IN_ENV);
 }
 
 template<class TARGET> void
-ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (
-    CORBA::Environment &TAO_IN_ENV)
-      ACE_THROW_SPEC (( CORBA::SystemException))
+ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (CORBA::Environment &TAO_IN_ENV)
 {
   target_->disconnect_push_supplier (TAO_IN_ENV);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 2ddc42d258b..f3f24f0e460 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -41,12 +41,10 @@ public:
   // Forwards all calls to <owner>.
 
   virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
-      ACE_THROW_SPEC (( CORBA::SystemException));
+                     CORBA::Environment &_env);
   // Forwards to target_.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &)
-      ACE_THROW_SPEC (( CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &);
   // Forwards to target_.
 
 private:
@@ -70,8 +68,7 @@ public:
   ACE_PushSupplier_Adapter (TARGET *target);
   // Forwards all calls to <owner>.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
-      ACE_THROW_SPEC (( CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &);
   // Forwards to target_.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index dcbfb0e8b6c..1fea8231ad1 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -92,7 +92,6 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr)
 void
 CC_LockSet::lock (CosConcurrencyControl::lock_mode mode,
                   CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n"));
 
@@ -113,7 +112,6 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode,
 CORBA::Boolean
 CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode,
                       CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockModeEnum lm = lmconvert (mode);
 
@@ -154,8 +152,6 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode)
 void
 CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode,
                     CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosConcurrencyControl::LockNotHeld))
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_LockSet::unlock\n"));
@@ -209,8 +205,6 @@ void
 CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
                          CosConcurrencyControl::lock_mode new_mode,
                          CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosConcurrencyControl::LockNotHeld))
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_LockSet::change_mode\n"));
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 24d0357f9d5..5b6087189c5 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -81,27 +81,21 @@ public:
 
   // = CosConcurrencyControl methods
   virtual void lock (CosConcurrencyControl::lock_mode mode,
-                     CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment &env);
   // Acquires this lock. Blocks until lock is obtained
 
   virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // Tries to acquire this lock. If it is not possible to acquire the
   // lock, false is returned
 
   virtual void unlock (CosConcurrencyControl::lock_mode mode,
-                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosConcurrencyControl::LockNotHeld));
+                       CORBA::Environment &env);
   // Releases this lock.
 
   virtual void change_mode (CosConcurrencyControl::lock_mode held_mode,
                             CosConcurrencyControl::lock_mode new_mode,
-                            CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosConcurrencyControl::LockNotHeld));
+                            CORBA::Environment &env);
   // Changes the mode of this lock.
 
   // = Debugging methods
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 6c8d8d48641..bb3c86dd21d 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -30,7 +30,6 @@ CC_LockSetFactory::~CC_LockSetFactory (void)
 
 CosConcurrencyControl::LockSet_ptr
 CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
 
@@ -48,7 +47,6 @@ CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV)
 CosConcurrencyControl::LockSet_ptr
 CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which,
                                    CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index c2f9cf9e470..f0f12c6d214 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -43,15 +43,10 @@ public:
   ~CC_LockSetFactory (void);
   // Destructor.
 
-  virtual CosConcurrencyControl::LockSet_ptr create (
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CosConcurrencyControl::LockSet_ptr create_related (
-      CosConcurrencyControl::LockSet_ptr which,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosConcurrencyControl::LockSet_ptr create (CORBA::Environment &env);
 
+  virtual CosConcurrencyControl::LockSet_ptr create_related (CosConcurrencyControl::LockSet_ptr which,
+                                                             CORBA::Environment &env);
 private:
   ACE_SYNCH_MUTEX lock_;
   // Lock to serialize the access to the factory.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
index 362875858cc..bca8b7bfca7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
@@ -27,7 +27,6 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -60,7 +59,6 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
 TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullSupplier::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
index a0556682983..29e08d8a9ed 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
@@ -51,13 +51,11 @@ public:
             RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
 
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier(CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_push_supplier(CORBA::Environment &ACE_TRY_ENV);
   // Returns a new ProxyPushSupplier_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier(CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    obtain_pull_supplier(CORBA::Environment &ACE_TRY_ENV);
   // Returns a new ProxyPullSupplier_ptr.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
index b6f5ca51e2c..a79a37674f7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
@@ -77,7 +77,6 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
 TAO_CosEC_EventChannel_i::for_consumers (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
   // responsible of removing this object.
@@ -87,7 +86,6 @@ TAO_CosEC_EventChannel_i::for_consumers (CORBA::Environment &)
 
 CosEventChannelAdmin::SupplierAdmin_ptr
 TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
   // responsible of removing this object, same here..
@@ -97,7 +95,6 @@ TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &)
 
 void
 TAO_CosEC_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the CosEventChannel
   PortableServer::POA_var poa =
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
index 8136df9e229..05596522e5f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
@@ -59,18 +59,15 @@ public:
   // Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
   // -1 on error, 0 on success.
 
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV);
   // The for_consumers method will return the same ConsumerAdmin_ptr
   // everytime its called.
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV);
   // The for_suppliers method will return the same SupplierAdmin_ptr
   // everytime its called.
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
   // Destroys this Event Channel object.
 
   void shutdown (CORBA::Environment &ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
index 6270f2e7fb1..26a990ce886 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
@@ -32,8 +32,7 @@ public:
   ~TAO_CosEC_PushSupplierWrapper (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV);
   // Disconnects the push supplier.
 
 private:
@@ -65,7 +64,6 @@ TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void)
 
 void
 TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->supplier_->disconnect_push_supplier (ACE_TRY_ENV);
 
@@ -104,7 +102,6 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void)
 void
 TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data,
                                      CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::Event buffer[1];
   // Create an event set that does not own the buffer....
@@ -140,7 +137,6 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data,
 
 void
 TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->proxypushconsumer_->disconnect_push_consumer (ACE_TRY_ENV);
 
@@ -162,8 +158,6 @@ TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (CORBA::Environment &ACE
 void
 TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier,
                                                       CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected))
 {
   if (this->connected ())
     ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
index 89ab9b8d6bf..5784e15ed91 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
@@ -57,18 +57,14 @@ public:
   // Destructor.
 
   virtual void push (const CORBA::Any &data,
-                     CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment &ACE_TRY_ENV);
   // Suppliers call this method to pass data to connected consumers.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV);
   // Disconnects the supplier from the event communication.
 
   virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier,
-                                     CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected));
+                                     CORBA::Environment &ACE_TRY_ENV);
   // Connects a push supplier.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
index 605737a275e..9239f86cc09 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
@@ -32,12 +32,10 @@ public:
   // Destructor.
 
   virtual void push (const RtecEventComm::EventSet & data,
-                     CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment &ACE_TRY_ENV);
   // This method is called by the RTEvent Channel to supply data.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV);
   // Disconnects the consumer from the event channel.
 
 private:
@@ -64,7 +62,6 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper ()
 void
 TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set,
                                      CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0;
        i < set.length ();
@@ -75,7 +72,6 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set,
 
 void
 TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the supplier proxy.
   this->consumer_->disconnect_push_consumer (ACE_TRY_ENV);
@@ -115,7 +111,6 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void)
 
 void
 TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->pps_->disconnect_push_supplier (ACE_TRY_ENV);
   ACE_CHECK;
@@ -139,11 +134,9 @@ TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer,
-                                                      CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected,
-                       CosEventChannelAdmin::TypeError))
+TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer
+(CosEventComm::PushConsumer_ptr push_consumer,
+ CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->connected ())
     ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
index 40e2c2fbfe5..548864e1ee9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
@@ -49,15 +49,11 @@ public:
   ~TAO_CosEC_ProxyPushSupplier_i (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV);
   // Ends the event communication and disposes this object.
 
   virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer,
-                                     CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosEventChannelAdmin::AlreadyConnected,
-                       CosEventChannelAdmin::TypeError));
+                                     CORBA::Environment &ACE_TRY_ENV);
   // Connects the <push_consumer> to the Event Channel.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
index 64e839f82b4..6d5b09275b6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
@@ -27,7 +27,6 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -59,7 +58,6 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
 TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullConsumer::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
index 27495df1860..4bb1d866953 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
@@ -53,13 +53,11 @@ public:
   // error.
 
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV);
   // Returns a new ProxyPushConsumer_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer(CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  obtain_pull_consumer(CORBA::Environment &ACE_TRY_ENV);
   // Returns a new ProxyPullConsumer_ptr.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp
index b25240072d0..a7a6efc3028 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp
@@ -252,21 +252,18 @@ CosEC_ServantBase::deactivate_cosec (CORBA::Environment &ACE_TRY_ENV)
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
 CosEC_ServantBase::for_consumers (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->cosec_->for_consumers (ACE_TRY_ENV);
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
 CosEC_ServantBase::for_suppliers (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->cosec_->for_suppliers (ACE_TRY_ENV);
 }
 
 void
 CosEC_ServantBase::destroy (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate all the contained servants and ourselves.
   // The poa will "destroy" the ref counted servants.
@@ -315,7 +312,7 @@ CosEC_ServantBase::init_SupplierQOS (RtecScheduler::handle_t supp_handle,
   // Something else: please make the EventSourceID for the
   // supplier also an option...
 
-  const char *c = " "; // space
+  char *c = " "; // space
   char *tok = 0;
 
  // if nothing was specified on the command line use defaults..
@@ -372,7 +369,7 @@ CosEC_ServantBase::init_ConsumerQOS (RtecScheduler::handle_t cons_handle,
   // them (just call insert_source() or insert_type() in the
   // parse_args routine).
 
-  const char *c = " "; // space
+  char *c = " "; // space
   char *tok = 0;
 
   consumer_qos.start_disjunction_group ();
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
index ab6b716bba3..cb4c03d0fc9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
@@ -71,14 +71,11 @@ class TAO_ORBSVCS_Export CosEC_ServantBase :
   // Deactivates the CosEC and friends with the POA.
 
   // =  POA_CosEventChannelAdmin::EventChannel methods.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV);
+
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV);
+
+  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
   // Destroys this Event Channel object.
 
  protected:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
index b0dff01c455..b3808aa30bc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
@@ -38,7 +38,7 @@ TAO_EC_Disconnected_Command<Target,Object>::execute (void* arg)
 // ****************************************************************
 
 template<class Target> int
-TAO_EC_Shutdown_Command_T<Target>::execute (void* arg)
+TAO_EC_Shutdown_Command<Target>::execute (void* arg)
 {
   CORBA::Environment *env = &TAO_default_environment ();
   if (arg != 0)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
index 24fe8431f62..b50e8c7ab3a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
@@ -114,7 +114,7 @@ private:
 // ****************************************************************
 
 template<class Target>
-class TAO_EC_Shutdown_Command_T : public ACE_Command_Base
+class TAO_EC_Shutdown_Command : public ACE_Command_Base
 {
   // = TITLE
   //   EC_Shutdown_Command
@@ -136,7 +136,7 @@ class TAO_EC_Shutdown_Command_T : public ACE_Command_Base
   // = TODO
   //
 public:
-  TAO_EC_Shutdown_Command_T (Target *target);
+  TAO_EC_Shutdown_Command (Target *target);
   // constructor...
 
   virtual int execute (void *arg);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.i b/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
index 202c66c0e16..fe46a45f115 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
@@ -23,8 +23,8 @@ TAO_EC_Disconnected_Command<Target,Object>::
 // ****************************************************************
 
 template<class Target>
-TAO_EC_Shutdown_Command_T<Target>::
-      TAO_EC_Shutdown_Command_T (Target *target)
+TAO_EC_Shutdown_Command<Target>::
+      TAO_EC_Shutdown_Command (Target *target)
   : target_ (target)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index 46094471085..23b54f7bf11 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -121,7 +121,6 @@ TAO_EC_ConsumerAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_EC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EC_ProxyPushSupplier* supplier =
     this->event_channel_->create_proxy_push_supplier ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 00e1eac2d41..4dee0091898 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -97,8 +97,7 @@ public:
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (CORBA::Environment &)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_supplier (CORBA::Environment &);
 
   // = The PortableServer::ServantBase methods
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index fcd1798745f..c56aa9dda40 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -2,7 +2,6 @@
 
 #include "EC_Default_Factory.h"
 #include "EC_Priority_Dispatching.h"
-#include "EC_MT_Dispatching.h"
 #include "EC_Basic_Filter_Builder.h"
 #include "EC_Sched_Filter_Builder.h"
 #include "EC_ConsumerAdmin.h"
@@ -18,7 +17,6 @@
 #include "EC_Reactive_Timeout_Generator.h"
 #include "EC_Event_Channel.h"
 #include "ace/Arg_Shifter.h"
-#include "ace/Sched_Params.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Default_Factory.i"
@@ -42,12 +40,6 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) +
-     ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  this->dispatching_threads_priority_ =
-    ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority);
-
   while (arg_shifter.is_anything_left ())
     {
       char *arg = arg_shifter.get_current ();
@@ -67,10 +59,6 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
                 {
                   this->dispatching_ = 1;
                 }
-              else if (ACE_OS::strcasecmp (opt, "mt") == 0)
-                {
-                  this->dispatching_ = 2;
-                }
               else
                 {
                   ACE_ERROR ((LM_ERROR,
@@ -82,18 +70,6 @@ TAO_EC_Default_Factory::init (int argc, char* argv[])
             }
         }
 
-      else if (ACE_OS::strcmp (arg, "-ECdispatchingthreads") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              this->dispatching_threads_ = ACE_OS::atoi (opt);
-              arg_shifter.consume_arg ();
-            }
-        }
-
       else if (ACE_OS::strcmp (arg, "-ECfiltering") == 0)
         {
           arg_shifter.consume_arg ();
@@ -407,11 +383,6 @@ TAO_EC_Default_Factory::create_dispatching (TAO_EC_Event_Channel *ec)
     return new TAO_EC_Reactive_Dispatching ();
   else if (this->dispatching_ == 1)
     return new TAO_EC_Priority_Dispatching (ec);
-  else if (this->dispatching_ == 2)
-    return new TAO_EC_MT_Dispatching (this->dispatching_threads_,
-                                      this->dispatching_threads_flags_,
-                                      this->dispatching_threads_priority_,
-                                      this->dispatching_threads_force_active_);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index 00ebfcfe4a5..d8f1af428fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -133,13 +133,6 @@ private:
   int consumer_admin_lock_;
   int supplier_admin_lock_;
   // Several flags to control the kind of object created.
-
-  int dispatching_threads_;
-  int dispatching_threads_flags_;
-  int dispatching_threads_priority_;
-  int dispatching_threads_force_active_;
-  // The MT dispatching priority has several arguments that could be
-  // controlled here...
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
index 7c5265dda7d..1fb821cdab1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
@@ -12,10 +12,6 @@ TAO_EC_Default_Factory::TAO_EC_Default_Factory (void)
      consumer_lock_ (TAO_EC_DEFAULT_CONSUMER_LOCK),
      supplier_lock_ (TAO_EC_DEFAULT_SUPPLIER_LOCK),
      consumer_admin_lock_ (TAO_EC_DEFAULT_CONSUMER_ADMIN_LOCK),
-     supplier_admin_lock_ (TAO_EC_DEFAULT_SUPPLIER_ADMIN_LOCK),
-     dispatching_threads_ (1),
-     dispatching_threads_flags_ (THR_NEW_LWP|THR_SCHED_FIFO),
-     dispatching_threads_priority_ (0),
-     dispatching_threads_force_active_ (1)
+     supplier_admin_lock_ (TAO_EC_DEFAULT_SUPPLIER_ADMIN_LOCK)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 478845f920a..cbd2d15ef7d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -60,14 +60,14 @@ public:
   // structures, it should only return once the threads have finished
   // their jobs.
 
-  virtual void push (TAO_EC_ProxyPushSupplier *proxy,
-                     const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info &qos_info,
-                     CORBA::Environment &env = TAO_default_environment ()) = 0;
-  virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
-                            RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info,
-                            CORBA::Environment &env = TAO_default_environment ()) = 0;
+  virtual void push (TAO_EC_ProxyPushSupplier* proxy,
+                     const RtecEventComm::EventSet& event,
+                     TAO_EC_QOS_Info& qos_info,
+                     CORBA::Environment& env) = 0;
+  virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
+                            RtecEventComm::EventSet& event,
+                            TAO_EC_QOS_Info& qos_info,
+                            CORBA::Environment& env) = 0;
   // The consumer represented by <proxy> should receive <event>.
   // It can use the information in <qos_info> to determine the event
   // priority (among other things).
@@ -92,14 +92,14 @@ public:
   // = The EC_Dispatching methods.
   virtual void activate (void);
   virtual void shutdown (void);
-  virtual void push (TAO_EC_ProxyPushSupplier *proxy,
-                     const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info &qos_info,
-                     CORBA::Environment &env = TAO_default_environment ());
-  virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
-                            RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info,
-                            CORBA::Environment &env = TAO_default_environment ());
+  virtual void push (TAO_EC_ProxyPushSupplier* proxy,
+                     const RtecEventComm::EventSet& event,
+                     TAO_EC_QOS_Info& qos_info,
+                     CORBA::Environment& env);
+  virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
+                            RtecEventComm::EventSet& event,
+                            TAO_EC_QOS_Info& qos_info,
+                            CORBA::Environment& env);
 };
 
 // @@ TODO
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index 90a27ffef04..72694d63538 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -171,21 +171,18 @@ TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier,
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
 TAO_EC_Event_Channel::for_consumers (CORBA::Environment& ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->consumer_admin_->_this (ACE_TRY_ENV);
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
 TAO_EC_Event_Channel::for_suppliers (CORBA::Environment& ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->supplier_admin_->_this (ACE_TRY_ENV);
 }
 
 void
 TAO_EC_Event_Channel::destroy (CORBA::Environment &TAO_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->shutdown (TAO_TRY_ENV);
 }
@@ -194,10 +191,9 @@ RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Event_Channel::append_observer (
        RtecEventChannelAdmin::Observer_ptr observer,
        CORBA::Environment &ACE_IN_ENV)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER))
 {
   return this->observer_strategy_->append_observer (observer, ACE_IN_ENV);
 }
@@ -206,10 +202,9 @@ void
 TAO_EC_Event_Channel::remove_observer (
        RtecEventChannelAdmin::Observer_Handle handle,
        CORBA::Environment &ACE_IN_ENV)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER))
 {
   this->observer_strategy_->remove_observer (handle, ACE_IN_ENV);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index 0063ac2b7a1..2911211282d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -204,35 +204,30 @@ public:
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (CORBA::Environment& env)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      for_consumers (CORBA::Environment& env);
   // The default implementation is:
   //    this->consumer_admin ()->_this (env);
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (CORBA::Environment& env)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+      for_suppliers (CORBA::Environment& env);
   // The default implementation is:
   //    this->supplier_admin ()->_this (env);
 
-  virtual void destroy (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (CORBA::Environment &env);
   // Commit suicide.
 
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr,
                        CORBA::Environment &env)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+      TAO_THROW_SPEC ((CORBA::SystemException,
+                       RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                       RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER));
   virtual void
       remove_observer (RtecEventChannelAdmin::Observer_Handle,
                        CORBA::Environment &env)
-      ACE_THROW_SPEC ((
-          CORBA::SystemException,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-          RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+      TAO_THROW_SPEC ((CORBA::SystemException,
+                       RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                       RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER));
 
 private:
   PortableServer::POA_var supplier_poa_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index a640bae0cbe..262cf32451e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -190,7 +190,6 @@ void
 TAO_EC_Gateway_IIOP::update_consumer (
     const RtecEventChannelAdmin::ConsumerQOS& c_qos,
     CORBA::Environment& ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (c_qos.dependencies.length () <= 1)
     return;
@@ -372,7 +371,6 @@ void
 TAO_EC_Gateway_IIOP::update_supplier (
     const RtecEventChannelAdmin::SupplierQOS&,
     CORBA::Environment&)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing...
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 984c047c313..50835bec895 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -62,7 +62,7 @@ public:
   virtual ~TAO_EC_Gateway (void);
   // Destructor
 
-  virtual void close (CORBA::Environment &env = TAO_default_environment ()) = 0;
+  virtual void close (CORBA::Environment& env) = 0;
   // The gateway must disconnect from all the relevant event channels,
   // or any other communication media (such as multicast groups).
 
@@ -114,38 +114,36 @@ public:
              RtecScheduler::Scheduler_ptr lcl_sched,
              const char* lcl_name,
              const char* rmt_name,
-             CORBA::Environment &env = TAO_default_environment ());
+             CORBA::Environment &_env);
   // To do its job this class requires to know the local and remote
   // ECs it will connect to; furthermore it also requires to build
   // RT_Infos for the local and remote schedulers.
   // @@ TODO part of the RT_Info is hardcoded, we need to make it
   // parametric.
 
-  void disconnect_push_supplier (CORBA::Environment & = TAO_default_environment ());
+  void disconnect_push_supplier (CORBA::Environment &);
   // The channel is disconnecting.
 
-  void disconnect_push_consumer (CORBA::Environment & = TAO_default_environment ());
+  void disconnect_push_consumer (CORBA::Environment &);
   // The channel is disconnecting.
 
   void push (const RtecEventComm::EventSet &events,
-             CORBA::Environment & = TAO_default_environment ());
+             CORBA::Environment &);
   // This is the Consumer side behavior, it pushes the events to the
   // local event channel.
 
-  int shutdown (CORBA::Environment & = TAO_default_environment ());
+  int shutdown (CORBA::Environment&);
   // Disconnect and shutdown the gateway
 
   // The following methods are documented in the base class.
-  virtual void close (CORBA::Environment &env = TAO_default_environment ());
+  virtual void close (CORBA::Environment& _env);
   virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                                CORBA::Environment &env = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                CORBA::Environment& env);
   virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-                                CORBA::Environment &env = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                CORBA::Environment& env);
 
 private:
-  void close_i (CORBA::Environment &);
+  void close_i (CORBA::Environment& );
 
   void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub,
                           CORBA::Environment& env);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
index f4eb2d78cbc..4f21aa4744d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
@@ -122,7 +122,6 @@ TAO_ECG_UDP_Sender::close (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_ECG_UDP_Sender::disconnect_push_consumer (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "ECG (%t): Supplier-consumer received "
@@ -132,7 +131,6 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (CORBA::Environment &)
 void
 TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
                           CORBA::Environment & ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Sender::push - \n"));
 
@@ -731,7 +729,6 @@ TAO_ECG_UDP_Receiver::close (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_ECG_UDP_Receiver::disconnect_push_supplier (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "ECG (%t): Supplier received "
@@ -1110,10 +1107,8 @@ TAO_ECG_Mcast_EH::unsubscribe (const ACE_INET_Addr &mcast_addr)
 }
 
 void
-TAO_ECG_Mcast_EH::update_consumer (
-    const RtecEventChannelAdmin::ConsumerQOS& sub,
-    CORBA::Environment& TAO_IN_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ECG_Mcast_EH::update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
+                                   CORBA::Environment& TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //          "ECG_Mcast_EH (%t) updating consumer\n"));
@@ -1163,7 +1158,6 @@ TAO_ECG_Mcast_EH::update_consumer (
 void
 TAO_ECG_Mcast_EH::update_supplier (const RtecEventChannelAdmin::SupplierQOS&,
                                    CORBA::Environment&)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
@@ -1176,19 +1170,16 @@ 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& TAO_IN_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ECG_Mcast_EH::Observer::update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
+                                             CORBA::Environment& TAO_IN_ENV)
 {
   this->eh_->update_consumer (sub, TAO_IN_ENV);
 }
 
 void
-TAO_ECG_Mcast_EH::Observer::update_supplier (
-    const RtecEventChannelAdmin::SupplierQOS& pub,
-    CORBA::Environment& TAO_IN_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_ECG_Mcast_EH::Observer::update_supplier (const
+                                             RtecEventChannelAdmin::SupplierQOS& pub,
+                                             CORBA::Environment& TAO_IN_ENV)
 {
   this->eh_->update_supplier (pub, TAO_IN_ENV);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index 0830737108a..c12b13aac4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -160,12 +160,9 @@ public:
   void close (CORBA::Environment &env = TAO_default_environment ());
   // Disconnect from the EC, but reconnection is still possible.
 
-  virtual void disconnect_push_consumer (CORBA::Environment & =
-                                             TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment & = TAO_default_environment ());
   virtual void push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment & = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment & = TAO_default_environment ());
   // The PushConsumer methods.
 
 private:
@@ -461,9 +458,8 @@ public:
   // messages...
 
   // The PushSupplier method.
-  virtual void disconnect_push_supplier (CORBA::Environment & =
-                                             TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment & = TAO_default_environment ());
+
 
   void get_addr (const RtecEventComm::EventHeader& header,
                  RtecUDPAdmin::UDP_Addr_out addr,
@@ -571,11 +567,9 @@ public:
   // Reactor callbacks
 
   void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                        CORBA::Environment &env = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                        CORBA::Environment &env = TAO_default_environment ());
   void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-                        CORBA::Environment &env = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                        CORBA::Environment &env = TAO_default_environment ());
   // The Observer methods
 
   class Observer : public POA_RtecEventChannelAdmin::Observer
@@ -594,16 +588,10 @@ public:
     // handler.
 
     // The Observer methods
-    virtual void update_consumer (
-        const RtecEventChannelAdmin::ConsumerQOS& sub,
-        CORBA::Environment &env =
-            TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    virtual void update_supplier (
-        const RtecEventChannelAdmin::SupplierQOS& pub,
-        CORBA::Environment &env =
-            TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
+                                  CORBA::Environment &env = TAO_default_environment ());
+    virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
+                                  CORBA::Environment &env = TAO_default_environment ());
 
   private:
     TAO_ECG_Mcast_EH *eh_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
deleted file mode 100644
index 414cd955f1b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-#include "EC_MT_Dispatching.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_MT_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_MT_Dispatching, "$Id$")
-
-TAO_EC_MT_Dispatching::TAO_EC_MT_Dispatching (int nthreads,
-                                              int thread_creation_flags,
-                                              int thread_priority,
-                                              int force_activate)
-  :  nthreads_ (nthreads),
-     thread_creation_flags_ (thread_creation_flags_),
-     thread_priority_ (thread_priority),
-     force_activate_ (force_activate),
-     active_ (0)
-{
-}
-
-void
-TAO_EC_MT_Dispatching::activate (void)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-
-  if (this->active_ != 0)
-    return;
-
-  if (this->task_.activate (this->thread_creation_flags_,
-                            this->nthreads_,
-                            1,
-                            this->thread_priority_) == -1)
-    {
-      if (this->force_activate_ != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "EC (%P|%t) activating dispatching queue at"
-                      " default priority\n"));
-          if (this->task_.activate (THR_BOUND, this->nthreads_) == -1)
-            ACE_ERROR ((LM_ERROR,
-                        "EC (%P|%t) cannot activate dispatching queue"));
-        }
-    }
-}
-
-void
-TAO_EC_MT_Dispatching::shutdown (void)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-
-  if (this->active_ == 0)
-    return;
-
-  this->task_.putq (new TAO_EC_Shutdown_Command);
-  this->thread_manager_.wait ();
-}
-
-void
-TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
-                             const RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& ACE_TRY_ENV)
-{
-  RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, event_copy, qos_info, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
-                                    RtecEventComm::EventSet& event,
-                                    TAO_EC_QOS_Info& qos_info,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Double checked locking....
-  if (this->active_ == 0)
-    this->activate ();
-
-  this->task_.push (proxy, event, ACE_TRY_ENV);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
deleted file mode 100644
index 426d0830998..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_MT_Dispatching
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_MT_DISPATCHING_H
-#define TAO_EC_MT_DISPATCHING_H
-
-#include "EC_Dispatching.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "EC_Dispatching_Task.h"
-
-class TAO_EC_Event_Channel;
-
-class TAO_ORBSVCS_Export TAO_EC_MT_Dispatching : public TAO_EC_Dispatching
-{
-  // = TITLE
-  //   Dispatching strategy that minimizes mt inversion.
-  //
-  // = DESCRIPTION
-  //   This strategy uses a single queue, serviced by one or more
-  //   threads.  It's main purpose is to decouple the suppliers from
-  //   the client execution time, specially in the collocated case.
-  //
-public:
-  TAO_EC_MT_Dispatching (int nthreads,
-                         int thread_creation_flags,
-                         int thread_priority,
-                         int force_activate);
-  // Constructor
-  // It will create <nthreads> servicing threads...
-
-  // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
-  virtual void push (TAO_EC_ProxyPushSupplier* proxy,
-                     const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
-  virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
-                            RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
-
-private:
-  ACE_Thread_Manager thread_manager_;
-  // Use our own thread manager.
-
-  int nthreads_;
-  // The number of active tasks
-
-  int thread_creation_flags_;
-  // The flags (THR_BOUND, THR_NEW_LWP, etc.) used to create the
-  // dispatching threads.
-
-  int thread_priority_;
-  // The priority of the dispatching threads.
-
-  int force_activate_;
-  // If activation at the requested priority fails then we fallback on
-  // the defaults for thread activation.
-
-  TAO_EC_Dispatching_Task task_;
-  // The dispatching task
-
-  ACE_SYNCH_MUTEX lock_;
-  // Synchronize access to internal data
-
-  int active_;
-  // Are the threads running?
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_MT_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_MT_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 3b99edfff07..b6f02239e07 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -26,10 +26,9 @@ RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Null_ObserverStrategy::append_observer (
        RtecEventChannelAdmin::Observer_ptr obs,
        CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER))
 {
   ACE_THROW_RETURN (
       RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(),
@@ -40,10 +39,9 @@ void
 TAO_EC_Null_ObserverStrategy::remove_observer (
        RtecEventChannelAdmin::Observer_Handle handle,
        CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER))
 {
   ACE_THROW (RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
 }
@@ -84,10 +82,9 @@ RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Basic_ObserverStrategy::append_observer (
        RtecEventChannelAdmin::Observer_ptr obs,
        CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER))
 {
   {
     ACE_GUARD_THROW_EX (
@@ -125,10 +122,9 @@ void
 TAO_EC_Basic_ObserverStrategy::remove_observer (
        RtecEventChannelAdmin::Observer_Handle handle,
        CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER))
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
       RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 7602008a98a..ed9c0b15ffb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -61,19 +61,17 @@ public:
 
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr,
-                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
+		       CORBA::Environment &env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER))
     = 0;
   virtual void remove_observer (
                         RtecEventChannelAdmin::Observer_Handle,
                         CORBA::Environment &env)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER))
      = 0;
   // The basic methods to support the EC strategies.
 
@@ -110,18 +108,16 @@ public:
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr,
-                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+		       CORBA::Environment &env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
                         RtecEventChannelAdmin::Observer_Handle,
                         CORBA::Environment &env)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER));
   virtual void connected (TAO_EC_ProxyPushConsumer*,
                           CORBA::Environment&);
   virtual void disconnected (TAO_EC_ProxyPushConsumer*,
@@ -161,18 +157,16 @@ public:
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr,
-                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+		       CORBA::Environment &env)
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
                         RtecEventChannelAdmin::Observer_Handle,
                         CORBA::Environment &env)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+    TAO_THROW_SPEC ((CORBA::SystemException,
+                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
+                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER));
   virtual void connected (TAO_EC_ProxyPushConsumer*,
                           CORBA::Environment&);
   virtual void disconnected (TAO_EC_ProxyPushConsumer*,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 62375c387f7..c1512e55bcb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -180,8 +180,6 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
       RtecEventComm::PushSupplier_ptr push_supplier,
       const RtecEventChannelAdmin::SupplierQOS& qos,
       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannelAdmin::AlreadyConnected))
 {
   {
     ACE_GUARD_THROW_EX (
@@ -232,7 +230,6 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
 void
 TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
                                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EC_SupplierFiltering* filter = 0;
   {
@@ -270,7 +267,6 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
 void
 TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
     ACE_GUARD_THROW_EX (
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 619e5eb1590..50b0a0f3c92 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -105,14 +105,10 @@ public:
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
                 const RtecEventChannelAdmin::SupplierQOS& qos,
-                CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected));
+                CORBA::Environment &);
   virtual void push (const RtecEventComm::EventSet& event,
-                     CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment &);
+  virtual void disconnect_push_consumer (CORBA::Environment &);
 
   // = The Servant methods
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
index 3d8d53be5ca..8686692192a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
@@ -67,7 +67,7 @@ template class ACE_Guard<TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set>
 template class TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set>;
 template class TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>;
 template class TAO_EC_Disconnected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>;
-template class TAO_EC_Shutdown_Command_T<TAO_EC_ProxyPushSupplier_Set>;
+template class TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set>;
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
@@ -78,6 +78,6 @@ template class TAO_EC_Shutdown_Command_T<TAO_EC_ProxyPushSupplier_Set>;
 #pragma instantiate ACE_Guard<TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set> >
 #pragma instantiate TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>
 #pragma instantiate TAO_EC_Disconnected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>
-#pragma instantiate TAO_EC_Shutdown_Command_T<TAO_EC_ProxyPushSupplier_Set>
+#pragma instantiate TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h
index f1e7314dda5..050446e1bf1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h
@@ -45,7 +45,7 @@
 class TAO_EC_ProxyPushSupplier;
 template<class Target,class Object> class TAO_EC_Connected_Command;
 template<class Target,class Object> class TAO_EC_Disconnected_Command;
-template<class Target> class TAO_EC_Shutdown_Command_T;
+template<class Target> class TAO_EC_Shutdown_Command;
 
 class TAO_ORBSVCS_Export TAO_EC_ProxyPushSupplier_Set
 {
@@ -213,39 +213,39 @@ public:
   // The implementation of this methods is provided by derived
   // classes, that provide appropiate locking.
 
-  virtual void connected (TAO_EC_ProxyPushSupplier *,
-                          CORBA::Environment & = TAO_default_environment ()) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier *,
-                             CORBA::Environment & = TAO_default_environment ()) = 0;
+  virtual void connected (TAO_EC_ProxyPushSupplier*,
+                          CORBA::Environment&) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
+                             CORBA::Environment&) = 0;
   // Used to inform the EC that a Supplier has connected or
   // disconnected from it.
 
-  virtual void shutdown (CORBA::Environment & = TAO_default_environment ()) = 0;
-  // The EC is shutting down, release all our resources.
+  virtual void shutdown (CORBA::Environment&) = 0;
+  // The EC is shutting down, release all our resources
 
 protected:
   virtual void connected_i (TAO_EC_ProxyPushSupplier* supplier,
-                            CORBA::Environment &env = TAO_default_environment ());
-  // The implementation of connected(), without locking.  It does not
-  // increase the reference count on the supplier
+                            CORBA::Environment &env);
+  // The implementation of connected(), without locking.
+  // It does not increase the reference count on the supplier
 
   virtual void disconnected_i (TAO_EC_ProxyPushSupplier* supplier,
-                               CORBA::Environment &env = TAO_default_environment ());
-  // The implementation of disconnected(), without locking.  It
-  // decreases the reference count on the supplier if the operation is
-  // successful.
+                               CORBA::Environment &env);
+  // The implementation of disconnected(), without locking.
+  // It decreases the reference count on the supplier if the operation
+  // is successful.
 
-  virtual void shutdown_i (CORBA::Environment &env = TAO_default_environment ());
+  virtual void shutdown_i (CORBA::Environment& env);
   // Implement the shutdown method, assuming the right locks are
   // acquired by the base class.
 
   typedef TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier> Connected_Command;
   typedef TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier> Disconnected_Command;
-  typedef TAO_EC_Shutdown_Command_T<TAO_EC_ProxyPushSupplier_Set> Shutdown_Command;
+  typedef TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set> Shutdown_Command;
 
   friend class TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>;
   friend class TAO_EC_Disconnected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>;
-  friend class TAO_EC_Shutdown_Command_T<TAO_EC_ProxyPushSupplier_Set>;
+  friend class TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set>;
   // This classes call the connected_i(), disconnected_i() and
   // shutdown_i() methods, that's ok because they do while this class
   // is holding its lock.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 913d05431d4..bbc4163bf0c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -135,9 +135,6 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
       RtecEventComm::PushConsumer_ptr push_consumer,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannelAdmin::AlreadyConnected,
-                     RtecEventChannelAdmin::TypeError))
 {
   {
     ACE_GUARD_THROW_EX (
@@ -205,7 +202,6 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
 void
 TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
     ACE_GUARD_THROW_EX (
@@ -230,7 +226,6 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
 
 void
 TAO_EC_ProxyPushSupplier::suspend_connection (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
@@ -242,7 +237,6 @@ TAO_EC_ProxyPushSupplier::suspend_connection (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_EC_ProxyPushSupplier::resume_connection (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 171051e6f6d..3b92c511b3b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -82,79 +82,75 @@ public:
   const RtecEventChannelAdmin::ConsumerQOS& subscriptions (void) const;
   // The QoS (subscription) used to connect to the EC.
 
-  virtual void connected (TAO_EC_ProxyPushConsumer *consumer,
-                          CORBA::Environment &env = TAO_default_environment ());
-  virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer,
-                             CORBA::Environment &env = TAO_default_environment ());
+  virtual void connected (TAO_EC_ProxyPushConsumer* consumer,
+                          CORBA::Environment &env);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer,
+                             CORBA::Environment &env);
   // Concrete implementations can use this methods to keep track of
   // the suppliers that publish its events.
 
-  virtual void connected (TAO_EC_ProxyPushSupplier *supplier,
-                          CORBA::Environment &env = TAO_default_environment ());
-  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier,
-                             CORBA::Environment &env = TAO_default_environment ());
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
+                          CORBA::Environment &env);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
+                             CORBA::Environment &env);
   // Usually implemented as no-ops, but some configurations may
   // require this methods.
 
-  virtual void shutdown (CORBA::Environment &env = TAO_default_environment ());
+  virtual void shutdown (CORBA::Environment &env);
   // The event channel is shutting down
 
   void push_to_consumer (const RtecEventComm::EventSet &event,
-                         CORBA::Environment &env = TAO_default_environment ());
+                         CORBA::Environment &env);
   void reactive_push_to_consumer (const RtecEventComm::EventSet &event,
-                                  CORBA::Environment &env = TAO_default_environment ());
+                                  CORBA::Environment &env);
   // Pushes to the consumer, verifies that it is connected and that it
   // is not suspended.
 
-  void push_timeout (TAO_EC_Filter *timeout_filter,
+  void push_timeout (TAO_EC_Filter* timeout_filter,
                      const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info &qos_info,
-                     CORBA::Environment &env = TAO_default_environment ());
+                     TAO_EC_QOS_Info& qos_info,
+                     CORBA::Environment &env);
   // Callback from the timeout filters
 
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos,
-                CORBA::Environment & = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected,
-                       RtecEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (CORBA::Environment & = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void suspend_connection (CORBA::Environment & = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void resume_connection (CORBA::Environment & = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                const RtecEventChannelAdmin::ConsumerQOS& qos,
+                CORBA::Environment &);
+  virtual void disconnect_push_supplier (CORBA::Environment &);
+  virtual void suspend_connection (CORBA::Environment &);
+  virtual void resume_connection (CORBA::Environment &);
 
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
   // Increment and decrement the reference count.
 
   // = The TAO_EC_Filter methods, only push() is implemented...
-  virtual int filter (const RtecEventComm::EventSet &event,
+  virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment &env = TAO_default_environment ());
-  virtual int filter_nocopy (RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info &qos_info,
-                             CORBA::Environment &env = TAO_default_environment ());
-  virtual void push (const RtecEventComm::EventSet &event,
+                      CORBA::Environment& env);
+  virtual int filter_nocopy (RtecEventComm::EventSet& event,
+                             TAO_EC_QOS_Info& qos_info,
+                             CORBA::Environment& env);
+  virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment &env = TAO_default_environment ());
-  virtual void push_nocopy (RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info,
-                            CORBA::Environment &env = TAO_default_environment ());
+                     CORBA::Environment& env);
+  virtual void push_nocopy (RtecEventComm::EventSet& event,
+                            TAO_EC_QOS_Info& qos_info,
+                            CORBA::Environment& env);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader &header) const;
-  virtual int add_dependencies (const RtecEventComm::EventHeader &header,
+  virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                CORBA::Environment &ACE_TRY_ENV);
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env = TAO_default_environment ());
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
+  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV =
+                             TAO_default_environment ());
+  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV =
+                                TAO_default_environment ());
 
 private:
   CORBA::Boolean is_connected_i (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index ebf3df3a76d..39ef736df01 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -136,7 +136,6 @@ TAO_EC_SupplierAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_EC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EC_ProxyPushConsumer* consumer =
     this->event_channel_->create_proxy_push_consumer ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 341f573fa88..d9beff66865 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -86,8 +86,7 @@ public:
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (CORBA::Environment &)
-          ACE_THROW_SPEC ((CORBA::SystemException));
+      obtain_push_consumer (CORBA::Environment &);
 
   typedef ACE_Unbounded_Set<TAO_EC_ProxyPushConsumer*> ConsumerSet;
   typedef ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushConsumer*> ConsumerSetIterator;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h
index f5ce0a5b8df..e9167f64c5d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h
@@ -95,18 +95,18 @@ public:
   // strategies that do not keep ProxyPushConsumer specific
   // information can simply ignore the message.
 
-  virtual void connected (TAO_EC_ProxyPushSupplier *supplier,
-                          CORBA::Environment &env = TAO_default_environment ()) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier,
-                             CORBA::Environment &env = TAO_default_environment ()) = 0;
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
+                          CORBA::Environment &env) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
+                             CORBA::Environment &env) = 0;
   // Concrete implementations can use this methods to keep track of
   // the consumers interested in this events.
 
-  virtual void shutdown (CORBA::Environment &env = TAO_default_environment ()) = 0;
+  virtual void shutdown (CORBA::Environment &env) = 0;
   // The event channel is shutting down.
 
-  virtual void push (const RtecEventComm::EventSet &event,
-                     CORBA::Environment & = TAO_default_environment ()) = 0;
+  virtual void push (const RtecEventComm::EventSet& event,
+                     CORBA::Environment &) = 0;
   // The ProxyPushConsumer delegates on this class to actually send
   // the event.
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index 5c3aef55cbd..d45ce1002ab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -15,9 +15,8 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void)
 
 void
 TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header,
-                                    RtecUDPAdmin::UDP_Addr_out addr,
-                                    CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+					  RtecUDPAdmin::UDP_Addr_out addr,
+					  CORBA::Environment&)
 {
   addr.ipaddr = header.type;
   addr.port = this->port_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 7eee5d32315..8d7c41842b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -61,8 +61,7 @@ public:
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
                          RtecUDPAdmin::UDP_Addr_out addr,
-                         CORBA::Environment& env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                         CORBA::Environment& env);
 
 private:
   CORBA::UShort port_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 82655af6334..2f8f9662fea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -292,12 +292,9 @@ ACE_Push_Supplier_Proxy::ACE_Push_Supplier_Proxy (ACE_ES_Supplier_Module *sm)
 }
 
 void
-ACE_Push_Supplier_Proxy::connect_push_supplier (
-    RtecEventComm::PushSupplier_ptr push_supplier,
-    const RtecEventChannelAdmin::SupplierQOS &qos,
-    CORBA::Environment &ACE_TRY_ENV)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         RtecEventChannelAdmin::AlreadyConnected))
+ACE_Push_Supplier_Proxy::connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier,
+                                                const RtecEventChannelAdmin::SupplierQOS &qos,
+                                                CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->connected ())
     ACE_THROW (RtecEventChannelAdmin::AlreadyConnected());
@@ -324,7 +321,6 @@ ACE_Push_Supplier_Proxy::connect_push_supplier (
 void
 ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event,
                                CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_ENTER_PUSH_SUPPLIER_PROXY_PUSH);
 
@@ -362,9 +358,7 @@ ACE_Push_Supplier_Proxy::time_stamp (RtecEventComm::EventSet& event)
 }
 
 void
-ACE_Push_Supplier_Proxy::disconnect_push_consumer (
-    CORBA::Environment &TAO_IN_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
+ACE_Push_Supplier_Proxy::disconnect_push_consumer (CORBA::Environment &TAO_IN_ENV)
 {
   ACE_TIMEPROBE_PRINT;
   if (this->connected ())
@@ -423,9 +417,6 @@ ACE_Push_Consumer_Proxy::connect_push_consumer (
     RtecEventComm::PushConsumer_ptr push_consumer,
     const RtecEventChannelAdmin::ConsumerQOS &qos,
     CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannelAdmin::AlreadyConnected,
-                       RtecEventChannelAdmin::TypeError))
 {
   if (this->connected ())
     ACE_THROW (RtecEventChannelAdmin::AlreadyConnected());
@@ -449,7 +440,6 @@ ACE_Push_Consumer_Proxy::connect_push_consumer (
 void
 ACE_Push_Consumer_Proxy::disconnect_push_supplier (
     CORBA::Environment &TAO_IN_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE_PRINT;
   this->push_consumer_ = RtecEventComm::PushConsumer::_nil ();
@@ -458,14 +448,12 @@ ACE_Push_Consumer_Proxy::disconnect_push_supplier (
 
 void
 ACE_Push_Consumer_Proxy::suspend_connection (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   correlation_.suspend ();
 }
 
 void
 ACE_Push_Consumer_Proxy::resume_connection (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   correlation_.resume ();
 }
@@ -593,7 +581,6 @@ ACE_EventChannel::~ACE_EventChannel (void)
 
 void
 ACE_EventChannel::destroy (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
     ACE_GUARD (ACE_ES_MUTEX, ace_mon, this->lock_);
@@ -778,10 +765,8 @@ ACE_EventChannel::update_supplier_gwys (CORBA::Environment& TAO_IN_ENV)
 RtecEventChannelAdmin::Observer_Handle
 ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs,
                                    CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
+  TAO_THROW_SPEC ((CORBA::SystemException,
+                   RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR))
 {
   TAO_GUARD_THROW_RETURN (ACE_ES_MUTEX, ace_mon, this->lock_, 0, TAO_IN_ENV,
                           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
@@ -810,10 +795,6 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs,
 void
 ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h,
                                    CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
   TAO_GUARD_THROW (ACE_ES_MUTEX, ace_mon, this->lock_, TAO_IN_ENV,
                    RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
@@ -1342,9 +1323,7 @@ ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request,
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-ACE_ES_Consumer_Module::obtain_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
+ACE_ES_Consumer_Module::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -1675,9 +1654,8 @@ ACE_ES_Consumer_Correlation::~ACE_ES_Consumer_Correlation (void)
 
 void
 ACE_ES_Consumer_Correlation::disconnect_push_supplier (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->connected_ = 0;
+  connected_ = 0;
 }
 
 int
@@ -3227,7 +3205,6 @@ ACE_ES_Supplier_Module::shutdown (void)
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
 ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 052c819cea8..71792377d92 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -242,34 +242,23 @@ public:
   // = The RtecEventChannelAdmin::EventChannel methods.
 
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_consumers (CORBA::Environment &);
   // In this implementation of the EC this returns the interface for
   // the Consumer_Module.
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    for_suppliers (CORBA::Environment &);
   // Return an interface to the Supplier_Module.
 
-  virtual void destroy (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (CORBA::Environment &);
   // Shutdown the EC, free all resources, stop all threads and then
   // shutdown the server where the Servant is running.
 
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-                     CORBA::Environment &env)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
+                     CORBA::Environment &env);
   virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle,
-                                CORBA::Environment &env)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
+                                CORBA::Environment &env);
   // The observer manipulators
 
   // = Timer managment
@@ -835,8 +824,7 @@ public:
   // that ACE_ES_Consumer_Rep_Timeout::execute can access it.
 
 private:
-  virtual void disconnect_push_supplier (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &);
   // Called when the channel disconnects us.
 
   int allocate_correlation_resources (ACE_ES_Dependency_Iterator &iter);
@@ -937,9 +925,7 @@ public:
   void open (ACE_ES_Dispatching_Module *down);
   // Link to the next module.
 
-  virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (CORBA::Environment &)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (CORBA::Environment &);
   // Factory method for push consumer proxies.
 
   void connected (ACE_Push_Consumer_Proxy *consumer,
@@ -1210,9 +1196,7 @@ public:
   void open (ACE_ES_Subscription_Module *up);
   // Associate the module to a channel.
 
-  virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (CORBA::Environment &)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (CORBA::Environment &);
   // Factory method for push supplier proxies.
 
   virtual void push (ACE_Push_Supplier_Proxy *proxy,
@@ -1282,24 +1266,19 @@ public:
 
   // = Operations public to suppliers.
 
-  virtual void connect_push_supplier (
-      RtecEventComm::PushSupplier_ptr push_supplier,
-      const RtecEventChannelAdmin::SupplierQOS& qos,
-      CORBA::Environment &)
-        ACE_THROW_SPEC ((CORBA::SystemException,
-                         RtecEventChannelAdmin::AlreadyConnected));
+  virtual void connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier,
+                                      const RtecEventChannelAdmin::SupplierQOS& qos,
+                                      CORBA::Environment &);
   // Suppliers connect via this interface.  <push_supplier> is a
   // reference to the supplier.  <qos> represents the publish types of
   // the supplier.
 
   virtual void push (const RtecEventComm::EventSet &event,
-                     CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment &);
   // Data arriving from a PushSupplier that must be sent to
   // consumers.  This is the entry point of all events.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &);
   // Disconnect the supplier from the channel.
 
   // = Operations for the Event Channel.
@@ -1366,26 +1345,19 @@ public:
 
   // = Interfaces exported to consumers.
 
-  virtual void connect_push_consumer (
-       RtecEventComm::PushConsumer_ptr push_consumer,
-       const RtecEventChannelAdmin::ConsumerQOS& qos,
-       CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannelAdmin::AlreadyConnected,
-                     RtecEventChannelAdmin::TypeError));
+  virtual void connect_push_consumer (RtecEventComm::PushConsumer_ptr push_consumer,
+                                      const RtecEventChannelAdmin::ConsumerQOS& qos,
+                                      CORBA::Environment &);
   // A push consumer is connecting.  <push_consumer> is a reference to
   // the consumer.  <qos> is the subscription types for the consumer.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &);
   // The consumer is disconnecting.
 
-  virtual void suspend_connection (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void suspend_connection (CORBA::Environment &);
   // Stop forwarding events to the calling consumer.
 
-  virtual void resume_connection (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void resume_connection (CORBA::Environment &);
   // Resume forwarding events to the calling consumer.
 
   // = Event Channel operations.
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
index 3183e507316..95618c081de 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
@@ -90,14 +90,12 @@ ACE_EventChannel::get_ref (CORBA::Environment &env)
 
 ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
 ACE_EventChannel::for_suppliers (CORBA::Environment &env)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return supplier_module_->get_ref (env);
 }
 
 ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
 ACE_EventChannel::for_consumers (CORBA::Environment &env)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return consumer_module_->get_ref (env);
 }
@@ -113,7 +111,7 @@ ACE_EventChannel::timer_module (void) const
 // Makes a temporary Event_var and appends it to the <dest>.
 ACE_INLINE void
 operator += (TAO_EC_Event_Array &dest,
-             const TAO_EC_Event &item)
+	     const TAO_EC_Event &item)
 {
   int length = dest.size ();
   dest.size (length + 1);
@@ -122,7 +120,7 @@ operator += (TAO_EC_Event_Array &dest,
 
 ACE_INLINE int
 operator == (const RtecEventComm::Event &event1,
-             const RtecEventComm::Event &event2)
+	     const RtecEventComm::Event &event2)
 {
   // Check if the sources are equal.  0 is a wildcard.
   if ((event1.header.source != 0)
@@ -181,7 +179,7 @@ ACE_ES_Disjunction_Group::reschedule_deadline (void)
   if (deadline_timer_rep_ != 0)
     {
       if (correlation_module_->reschedule_timeout (deadline_timer_rep_) == -1)
-        ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Disjunction_Group::reschedule_deadline"));
+	ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Disjunction_Group::reschedule_deadline"));
     }
 }
 
@@ -198,8 +196,8 @@ ACE_ES_Disjunction_Group::set_deadline_timeout (ACE_ES_Consumer_Rep_Timeout *cr)
 
 ACE_INLINE void
 ACE_ES_Disjunction_Group::add_events (TAO_EC_Event_Array *outbox,
-                                      TAO_EC_Event_Array *,
-                                      u_long &)
+				      TAO_EC_Event_Array *,
+				      u_long &)
 {
   // Append the act.
   if (!this->act_.empty ())
@@ -238,7 +236,7 @@ ACE_ES_Consumer_Rep::ACE_ES_Consumer_Rep (void) :
 
 ACE_INLINE void
 ACE_ES_Consumer_Rep::init (ACE_ES_Consumer_Correlation *correlation,
-                           RtecEventChannelAdmin::Dependency& dependency)
+			   RtecEventChannelAdmin::Dependency& dependency)
 {
   dependency_ = &dependency;
   correlation_ = correlation;
@@ -285,7 +283,7 @@ ACE_ES_Consumer_Rep::add_disjunction_group (ACE_ES_Disjunction_Group &dg)
 {
   if (disjunction_group_ != 0)
     ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Rep::add_disjunction_group: "
-                "disjunction_group already set!\n"));
+		"disjunction_group already set!\n"));
   disjunction_group_ = &dg;
   return 0;
 }
@@ -379,7 +377,7 @@ ACE_RTU_Manager::should_preempt (void)
       // This routine was dead-code, but I'll leave it here until I
       // find out what it is supposed to do.
       ACE_ERROR ((LM_WARNING,
-                  "EC (%t) RTU_Manager::should_preempt - obsolete\n"));
+		  "EC (%t) RTU_Manager::should_preempt - obsolete\n"));
 
       int should_preempt = should_preempt_;
       should_preempt_ = 0;
@@ -431,7 +429,7 @@ ACE_ES_Consumer_Rep_Timeout::ACE_ES_Consumer_Rep_Timeout (void)
 
 ACE_INLINE void
 ACE_ES_Consumer_Rep_Timeout::init (ACE_ES_Consumer_Correlation *correlation,
-                                   RtecEventChannelAdmin::Dependency &dep)
+				   RtecEventChannelAdmin::Dependency &dep)
 {
   TAO_EC_Event_Set *temp = TAO_EC_Event_Set::_create (dep.event);
   // @@ TODO throw an exception
@@ -529,28 +527,28 @@ ACE_ES_Dependency_Iterator::parse (void)
   for (CORBA::ULong x = 0; x < rep_.length (); x++)
     {
       if (rt_info_ == 0)
-        rt_info_ = rep_[x].rt_info;
+	rt_info_ = rep_[x].rt_info;
 
       switch (rep_[x].event.header.type)
-        {
-        case ACE_ES_CONJUNCTION_DESIGNATOR:
-          n_conjunctions_++;
-          break;
-
-        case ACE_ES_DISJUNCTION_DESIGNATOR:
-          n_disjunctions_++;
-          break;
-
-        case ACE_ES_EVENT_TIMEOUT:
-        case ACE_ES_EVENT_INTERVAL_TIMEOUT:
-        case ACE_ES_EVENT_DEADLINE_TIMEOUT:
-          n_timeouts_++;
-          break;
-
-        default:
-          n_events_++;
-          break;
-        }
+	{
+	case ACE_ES_CONJUNCTION_DESIGNATOR:
+	  n_conjunctions_++;
+	  break;
+
+	case ACE_ES_DISJUNCTION_DESIGNATOR:
+	  n_disjunctions_++;
+	  break;
+
+	case ACE_ES_EVENT_TIMEOUT:
+	case ACE_ES_EVENT_INTERVAL_TIMEOUT:
+	case ACE_ES_EVENT_DEADLINE_TIMEOUT:
+	  n_timeouts_++;
+	  break;
+
+	default:
+	  n_events_++;
+	  break;
+	}
     }
 
   return 0;
@@ -621,8 +619,8 @@ ACE_ES_Conjunction_Group::should_forward (u_long pending_flags)
 
 ACE_INLINE void
 ACE_ES_Conjunction_Group::add_events (TAO_EC_Event_Array *outbox,
-                                      TAO_EC_Event_Array *pending_events,
-                                      u_long &pending_flags)
+				      TAO_EC_Event_Array *pending_events,
+				      u_long &pending_flags)
 {
   // Append the act first.
   if (!this->act_.empty ())
@@ -635,9 +633,9 @@ ACE_ES_Conjunction_Group::add_events (TAO_EC_Event_Array *outbox,
       // If this type_id is part of the correlation, then append each
       // event pending to the outbox.
       if (ACE_BIT_ENABLED (forward_value_, ACE_INT2BIT[x]))
-        {
-          // Step through each of the pending events.
-          TAO_EC_Event_Array &pending = pending_events[x];
+	{
+	  // Step through each of the pending events.
+	  TAO_EC_Event_Array &pending = pending_events[x];
 
           size_t outbox_end = 0;
           if (outbox != 0)
@@ -645,27 +643,27 @@ ACE_ES_Conjunction_Group::add_events (TAO_EC_Event_Array *outbox,
               outbox_end = outbox->size ();
               outbox->size (outbox_end + pending.size ());
             }
-          for (CORBA::ULong i = 0; i < pending.size (); ++i)
-            {
+	  for (CORBA::ULong i = 0; i < pending.size (); ++i)
+	    {
               if (pending[i].empty ())
                 continue;
 
-              // Add the pending event to the outbox.
-              if (outbox != 0)
+	      // Add the pending event to the outbox.
+	      if (outbox != 0)
                 outbox->set (pending[i], outbox_end++);
 
-              // Remove the event from the pending events array.
-              pending[i].clear ();
-            }
+	      // Remove the event from the pending events array.
+	      pending[i].clear ();
+	    }
 
-          // Reset the array length.
-          pending.size (0);
-          // Since we just emptied the events for this type, clear the
-          // x^th bit in pending flags.
-          ACE_CLR_BITS (pending_flags, ACE_INT2BIT[x]);
-          // Clear the x^th bit in fv.
-          ACE_CLR_BITS (fv, ACE_INT2BIT[x]);
-        }
+	  // Reset the array length.
+	  pending.size (0);
+	  // Since we just emptied the events for this type, clear the
+	  // x^th bit in pending flags.
+	  ACE_CLR_BITS (pending_flags, ACE_INT2BIT[x]);
+	  // Clear the x^th bit in fv.
+	  ACE_CLR_BITS (fv, ACE_INT2BIT[x]);
+	}
 
       x++;
     }
@@ -675,10 +673,10 @@ 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)
+				  const ACE_Command_Base *act,
+				  RtecScheduler::Preemption_Priority_t preemption_priority,
+				  const RtecScheduler::Time &delta,
+				  const RtecScheduler::Time &interval)
 {
   if (rt_info != 0)
     {
@@ -697,10 +695,10 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
 #else
           ACE_Scheduler_Factory::server()->add_dependency
             (rt_info,
-             timer_rtinfo,
-             1,
-             RtecScheduler::ONE_WAY_CALL,
-             TAO_TRY_ENV);
+	     timer_rtinfo,
+	     1,
+	     RtecScheduler::ONE_WAY_CALL,
+	     TAO_TRY_ENV);
 #endif
           TAO_CHECK_ENV;
         }
@@ -719,15 +717,15 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
   ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, interval);
 
   return this->timer_module ()->schedule_timer (preemption_priority,
-                                                ACE_const_cast(ACE_Command_Base*,act),
-                                                tv_delta,
+						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)
+				int id,
+				ACE_Command_Base *&act)
 {
     return this->timer_module ()->cancel_timer (preemption_priority,
                                                 id,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
index 0026482f5bc..888f886cf00 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
@@ -30,7 +30,6 @@ Logger_Factory_i::~Logger_Factory_i (void)
 Logger_ptr
 Logger_Factory_i::make_logger (const char *name,
                                CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Logger_i *result;
   // If name is already in the map, <find> will assign <result> to the
@@ -123,7 +122,6 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level)
 void
 Logger_i::log (const Logger::Log_Record &log_rec,
                CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->logv (log_rec, verbosity_level_, TAO_IN_ENV);
 }
@@ -131,7 +129,6 @@ Logger_i::log (const Logger::Log_Record &log_rec,
 void
 Logger_i::log2 (const Logger::Log_Record &log_rec,
                CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->logv (log_rec, verbosity_level_, TAO_IN_ENV);
 }
@@ -140,7 +137,6 @@ void
 Logger_i::logv2 (const Logger::Log_Record &log_rec,
                Logger::Verbosity_Level verbosity,
                CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->logv (log_rec, verbosity, TAO_IN_ENV);
 }
@@ -149,7 +145,6 @@ void
 Logger_i::logv (const Logger::Log_Record &log_rec,
                Logger::Verbosity_Level verbosity,
                CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create an <ACE_Log_Record> to leverage existing logging
   // code. Since Logger::Log_Priority enum tags don't cleanly map to
@@ -203,11 +198,10 @@ Logger_i::verbosity (void) const
 }
 
 void
-Logger_i::verbosity (Logger::Verbosity_Level level,
-                     CORBA::Environment &)
-    ACE_THROW_SPEC (())
+Logger_i::verbosity (Logger::Verbosity_Level level, CORBA::Environment &env)
 {
-  this->verbosity_level_ = level;
+  ACE_UNUSED_ARG (env);
+  verbosity_level_ = level;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.h b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h
index 816ef1f7120..2eee486d438 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.h
@@ -34,34 +34,29 @@ public:
   // destructor
 
   virtual void log (const Logger::Log_Record &log_rec,
-                    CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Environment &_env);
   // Writes the <log_rec> to the standard output.
 
   virtual void logv (const Logger::Log_Record &log_rec,
                      Logger::Verbosity_Level verbosity,
-                     CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment &_env);
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
   virtual void log2 (const Logger::Log_Record &log_rec,
-                     CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment &_env);
   // Writes the <log_rec> to the standard output.
   
   virtual void logv2 (const Logger::Log_Record &log_rec,
                       Logger::Verbosity_Level verbosity,
-                      CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Environment &_env);
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
   Logger::Verbosity_Level verbosity (void) const;
   // Gets the verbosity level
 
-  void verbosity (Logger::Verbosity_Level level, CORBA::Environment &env)
-    ACE_THROW_SPEC (());
+  void verbosity (Logger::Verbosity_Level level, CORBA::Environment &env);
   // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE
   //  and SILENT}. Defaults to VERBOSE
 
@@ -96,7 +91,7 @@ public:
 
   virtual Logger_ptr make_logger (const char *name,
                                   CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_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
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index 778647db381..3a176595405 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -109,7 +109,6 @@ ifneq (,$(findstring Event2,$(TAO_ORBSVCS)))
         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 \
@@ -255,10 +254,10 @@ ifneq (,$(findstring Naming,$(TAO_ORBSVCS)))
         IOR_Multicast \
         Naming/Naming_Context \
         Naming/Hash_Naming_Context \
+        Naming/Entries \
         Naming/Persistent_Naming_Context \
-	Naming/Transient_Naming_Context \
         Naming/Persistent_Entries \
-        Naming/Entries \
+        Naming/Persistent_Bindings_Map \
         Naming/Persistent_Context_Index \
         Naming/Naming_Utils
 endif # Naming
@@ -471,7 +470,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -491,25 +501,14 @@ 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 \
- $(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/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 \
@@ -525,8 +524,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -565,7 +563,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -728,7 +725,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -748,25 +756,14 @@ 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 \
- $(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/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 \
@@ -782,8 +779,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -822,7 +818,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -982,7 +977,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1002,25 +1008,14 @@ 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 \
- $(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/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 \
@@ -1036,8 +1031,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1076,7 +1070,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -1235,7 +1228,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1255,25 +1259,14 @@ 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 \
- $(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/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 \
@@ -1289,8 +1282,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1329,7 +1321,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -1490,7 +1481,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1510,25 +1512,14 @@ 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 \
- $(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/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 \
@@ -1544,8 +1535,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1584,7 +1574,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -1755,7 +1744,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1775,25 +1775,14 @@ 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 \
- $(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/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 \
@@ -1802,8 +1791,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1842,7 +1830,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -2013,7 +2000,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2033,25 +2031,14 @@ 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 \
- $(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/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 \
@@ -2060,8 +2047,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2100,7 +2086,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -2275,7 +2260,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2295,25 +2291,14 @@ 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 \
- $(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/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 \
@@ -2322,8 +2307,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2362,7 +2346,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -2533,7 +2516,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2553,25 +2547,14 @@ 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 \
- $(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/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 \
@@ -2580,8 +2563,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2620,7 +2602,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -2783,7 +2764,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2803,25 +2795,14 @@ 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 \
- $(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/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 \
@@ -2837,8 +2818,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2877,7 +2857,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -3040,7 +3019,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3060,25 +3050,14 @@ 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 \
- $(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/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 \
@@ -3094,8 +3073,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3134,7 +3112,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -3298,7 +3275,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3318,25 +3306,14 @@ 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 \
- $(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/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 \
@@ -3352,8 +3329,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3392,7 +3368,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -3553,7 +3528,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3573,25 +3559,14 @@ 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 \
- $(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/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 \
@@ -3607,8 +3582,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3647,7 +3621,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -3810,7 +3783,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3830,25 +3814,14 @@ 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 \
- $(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/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 \
@@ -3864,8 +3837,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3904,7 +3876,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -4067,7 +4038,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -4087,25 +4069,14 @@ 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 \
- $(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/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 \
@@ -4121,8 +4092,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4161,7 +4131,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -4323,7 +4292,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -4343,25 +4323,14 @@ 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 \
- $(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/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 \
@@ -4377,8 +4346,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4417,7 +4385,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -4578,7 +4545,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -4598,25 +4576,14 @@ 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 \
- $(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/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 \
@@ -4632,8 +4599,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4672,7 +4638,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -4840,7 +4805,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -4860,25 +4836,14 @@ 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 \
- $(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/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 \
@@ -4887,8 +4852,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4927,7 +4891,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -5095,7 +5058,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -5115,25 +5089,14 @@ 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 \
- $(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/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 \
@@ -5142,8 +5105,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -5182,7 +5144,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -5343,7 +5304,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -5363,25 +5335,14 @@ 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 \
- $(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/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 \
@@ -5397,8 +5358,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -5437,7 +5397,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -5596,7 +5555,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -5616,25 +5586,14 @@ 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 \
- $(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/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 \
@@ -5650,8 +5609,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -5690,7 +5648,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -5851,7 +5808,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -5871,25 +5839,14 @@ 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 \
- $(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/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 \
@@ -5905,8 +5862,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -5945,7 +5901,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -6105,7 +6060,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -6125,25 +6091,14 @@ 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 \
- $(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/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 \
@@ -6159,8 +6114,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -6199,7 +6153,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -6362,7 +6315,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -6382,25 +6346,14 @@ 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 \
- $(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/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 \
@@ -6416,8 +6369,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -6456,7 +6408,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -6617,7 +6568,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -6637,25 +6599,14 @@ 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 \
- $(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/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 \
@@ -6671,8 +6622,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -6711,7 +6661,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -6870,7 +6819,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -6890,25 +6850,14 @@ 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 \
- $(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/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 \
@@ -6924,8 +6873,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -6964,7 +6912,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -7125,7 +7072,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -7145,25 +7103,14 @@ 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 \
- $(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/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 \
@@ -7179,8 +7126,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -7219,7 +7165,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -7382,7 +7327,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -7402,25 +7358,14 @@ 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 \
- $(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/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 \
@@ -7436,8 +7381,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -7476,7 +7420,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -7639,7 +7582,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -7659,25 +7613,14 @@ 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 \
- $(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/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 \
@@ -7693,8 +7636,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -7733,7 +7675,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -7900,7 +7841,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -7920,25 +7872,14 @@ 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 \
- $(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/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 \
@@ -7954,8 +7895,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -7994,7 +7934,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -8158,7 +8097,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -8178,25 +8128,14 @@ 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 \
- $(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/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 \
@@ -8212,8 +8151,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -8252,7 +8190,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -8414,7 +8351,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -8434,25 +8382,14 @@ 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 \
- $(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/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 \
@@ -8468,8 +8405,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -8508,7 +8444,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -8670,7 +8605,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -8690,25 +8636,14 @@ 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 \
- $(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/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 \
@@ -8724,8 +8659,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -8764,7 +8698,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -8928,7 +8861,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -8948,25 +8892,14 @@ 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 \
- $(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/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 \
@@ -8982,8 +8915,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9022,7 +8954,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -9182,7 +9113,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -9202,25 +9144,14 @@ 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 \
- $(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/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 \
@@ -9236,8 +9167,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9276,7 +9206,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -9438,7 +9367,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -9458,25 +9398,14 @@ 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 \
- $(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/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 \
@@ -9492,8 +9421,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9532,7 +9460,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -9694,7 +9621,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -9714,25 +9652,14 @@ 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 \
- $(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/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 \
@@ -9748,8 +9675,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9788,7 +9714,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -9950,7 +9875,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -9970,25 +9906,14 @@ 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 \
- $(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/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 \
@@ -10004,8 +9929,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -10044,7 +9968,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -10205,7 +10128,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -10225,25 +10159,14 @@ 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 \
- $(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/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 \
@@ -10259,8 +10182,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -10299,7 +10221,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -10459,7 +10380,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -10479,25 +10411,14 @@ 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 \
- $(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/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 \
@@ -10513,8 +10434,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -10553,7 +10473,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -10713,7 +10632,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -10733,25 +10663,14 @@ 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 \
- $(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/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 \
@@ -10767,8 +10686,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -10807,7 +10725,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -10969,7 +10886,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -10989,25 +10917,14 @@ 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 \
- $(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/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 \
@@ -11023,8 +10940,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -11063,7 +10979,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -11223,7 +11138,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -11243,25 +11169,14 @@ 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 \
- $(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/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 \
@@ -11277,8 +11192,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -11317,7 +11231,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -11478,7 +11391,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -11498,25 +11422,14 @@ 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 \
- $(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/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 \
@@ -11532,8 +11445,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -11572,7 +11484,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -11751,7 +11662,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -11771,25 +11693,14 @@ 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 \
- $(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/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 \
@@ -11805,8 +11716,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -11845,7 +11755,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -12075,7 +11984,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -12095,25 +12015,14 @@ 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 \
- $(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/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 \
@@ -12129,8 +12038,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -12169,7 +12077,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -12397,7 +12304,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -12417,25 +12335,14 @@ 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 \
- $(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/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 \
@@ -12451,8 +12358,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -12491,7 +12397,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -12702,7 +12607,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -12722,25 +12638,14 @@ 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 \
- $(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/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 \
@@ -12756,8 +12661,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -12796,7 +12700,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -12969,7 +12872,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -12989,25 +12903,14 @@ 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 \
- $(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/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 \
@@ -13023,8 +12926,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -13063,7 +12965,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -13108,8 +13009,7 @@ 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_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_SupplierAdmin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -13280,7 +13180,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -13300,25 +13211,14 @@ 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 \
- $(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/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 \
@@ -13327,8 +13227,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -13367,7 +13266,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -13405,15 +13303,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_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.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_Factory.i Event/EC_Defaults.h Event/EC_Event_Channel.i \
+ Event/EC_Command.h Event/EC_Command.i Event/EC_Command.cpp
 .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 \
@@ -13572,7 +13470,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -13592,25 +13501,14 @@ 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 \
- $(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/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 \
@@ -13619,8 +13517,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -13659,7 +13556,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -13860,7 +13756,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -13880,25 +13787,14 @@ 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 \
- $(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/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 \
@@ -13907,8 +13803,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -13947,7 +13842,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -14148,7 +14042,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -14168,25 +14073,14 @@ 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 \
- $(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/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 \
@@ -14195,8 +14089,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -14235,7 +14128,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -14427,7 +14319,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -14447,25 +14350,14 @@ 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 \
- $(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/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 \
@@ -14481,8 +14373,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -14521,7 +14412,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -14686,7 +14576,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -14706,25 +14607,14 @@ 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 \
- $(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/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 \
@@ -14740,8 +14630,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -14780,7 +14669,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -14949,7 +14837,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -14969,25 +14868,14 @@ 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 \
- $(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/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 \
@@ -15003,8 +14891,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -15043,7 +14930,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -15089,8 +14975,7 @@ 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_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_ProxySupplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -15243,7 +15128,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -15263,25 +15159,14 @@ 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 \
- $(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/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 \
@@ -15297,8 +15182,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -15337,7 +15221,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -15502,7 +15385,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -15522,25 +15416,14 @@ 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 \
- $(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/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 \
@@ -15556,8 +15439,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -15596,7 +15478,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -15764,7 +15645,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -15784,25 +15676,14 @@ 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 \
- $(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/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 \
@@ -15818,8 +15699,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -15858,7 +15738,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -16049,7 +15928,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -16069,25 +15959,14 @@ 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 \
- $(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/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 \
@@ -16103,8 +15982,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -16143,7 +16021,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -16303,7 +16180,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -16323,25 +16211,14 @@ 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 \
- $(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/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 \
@@ -16357,8 +16234,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -16397,7 +16273,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -16562,7 +16437,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -16582,25 +16468,14 @@ 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 \
- $(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/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 \
@@ -16616,8 +16491,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -16656,7 +16530,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -16703,8 +16576,7 @@ 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_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_SupplierAdmin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -16719,7 +16591,8 @@ 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_ProxyPushSupplier_Set_T.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.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 \
@@ -16872,7 +16745,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -16892,25 +16776,14 @@ 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 \
- $(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/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 \
@@ -16926,8 +16799,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -16966,7 +16838,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -17131,7 +17002,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -17151,25 +17033,14 @@ 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 \
- $(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/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 \
@@ -17185,8 +17056,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -17225,7 +17095,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -17390,7 +17259,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -17410,25 +17290,14 @@ 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 \
- $(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/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 \
@@ -17444,8 +17313,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -17484,7 +17352,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -17650,7 +17517,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -17670,25 +17548,14 @@ 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 \
- $(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/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 \
@@ -17704,8 +17571,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -17744,7 +17610,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -17920,7 +17785,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -17940,25 +17816,14 @@ 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 \
- $(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/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 \
@@ -17974,8 +17839,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -18014,7 +17878,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -18063,8 +17926,7 @@ 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_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_SupplierAdmin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -18079,7 +17941,8 @@ 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_ProxyPushSupplier_Set_T.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.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 \
@@ -18232,7 +18095,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -18252,25 +18126,14 @@ 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 \
- $(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/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 \
@@ -18286,8 +18149,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -18326,7 +18188,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -18375,8 +18236,7 @@ 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_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
  Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
  Event/EC_SupplierAdmin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
@@ -18396,7 +18256,8 @@ 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_ProxyPushSupplier_Set_T.cpp Event/EC_Command.h \
+ Event/EC_Command.i Event/EC_Command.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 \
@@ -18557,7 +18418,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -18574,25 +18446,14 @@ 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 \
- $(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/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 \
@@ -18608,8 +18469,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -18648,7 +18508,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -18696,8 +18555,7 @@ 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_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
+ Event/EC_Busy_Lock.i Event/EC_Busy_Lock.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 \
@@ -18854,7 +18712,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -18874,25 +18743,14 @@ 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 \
- $(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/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 \
@@ -18908,8 +18766,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -18948,7 +18805,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -18961,7 +18817,6 @@ 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 \
@@ -18994,7 +18849,8 @@ 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_ProxySupplier.i Event/EC_Command.h Event/EC_Command.i \
+ Event/EC_Command.cpp
 .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 \
@@ -19143,7 +18999,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -19163,25 +19030,14 @@ 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 \
- $(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/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 \
@@ -19197,8 +19053,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -19237,7 +19092,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -19283,7 +19137,6 @@ 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 \
@@ -19442,7 +19295,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -19462,25 +19326,14 @@ 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 \
- $(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/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 \
@@ -19496,8 +19349,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -19536,7 +19388,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -19737,7 +19588,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -19757,25 +19619,14 @@ 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 \
- $(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/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 \
@@ -19791,8 +19642,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -19831,7 +19681,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -20005,7 +19854,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -20025,25 +19885,14 @@ 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 \
- $(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/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 \
@@ -20059,8 +19908,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -20099,7 +19947,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -20267,7 +20114,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -20287,25 +20145,14 @@ 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 \
- $(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/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 \
@@ -20321,8 +20168,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -20361,7 +20207,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -20603,7 +20448,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -20623,25 +20479,14 @@ 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 \
- $(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/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 \
@@ -20657,8 +20502,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -20676,7 +20520,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -20867,7 +20710,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -20887,25 +20741,14 @@ 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 \
- $(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/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 \
@@ -20921,8 +20764,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -20961,7 +20803,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -21130,7 +20971,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -21150,25 +21002,14 @@ 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 \
- $(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/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 \
@@ -21184,8 +21025,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -21224,7 +21064,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -21426,7 +21265,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -21446,25 +21296,14 @@ 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 \
- $(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/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 \
@@ -21480,8 +21319,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -21520,7 +21358,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -21688,7 +21525,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -21708,25 +21556,14 @@ 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 \
- $(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/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 \
@@ -21742,8 +21579,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -21782,7 +21618,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -21950,7 +21785,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -21970,25 +21816,14 @@ 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 \
- $(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/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 \
@@ -22004,8 +21839,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -22044,7 +21878,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -22238,7 +22071,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -22258,25 +22102,14 @@ 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 \
- $(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/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 \
@@ -22292,8 +22125,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -22332,7 +22164,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -22518,7 +22349,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -22538,25 +22380,14 @@ 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 \
- $(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/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 \
@@ -22572,8 +22403,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -22612,7 +22442,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -22818,7 +22647,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -22838,25 +22678,14 @@ 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 \
- $(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/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 \
@@ -22872,8 +22701,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -22912,7 +22740,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -23121,7 +22948,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -23141,25 +22979,14 @@ 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 \
- $(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/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 \
@@ -23175,8 +23002,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -23215,7 +23041,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -23424,7 +23249,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -23444,25 +23280,14 @@ 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 \
- $(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/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 \
@@ -23478,8 +23303,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -23518,7 +23342,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -23713,7 +23536,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -23733,25 +23567,14 @@ 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 \
- $(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/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 \
@@ -23767,8 +23590,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -23807,7 +23629,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -24027,7 +23848,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -24047,25 +23879,14 @@ 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 \
- $(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/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 \
@@ -24081,8 +23902,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -24121,7 +23941,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -24311,7 +24130,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -24331,25 +24161,14 @@ 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 \
- $(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/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 \
@@ -24365,8 +24184,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -24405,7 +24223,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -24646,7 +24463,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -24666,25 +24494,14 @@ 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 \
- $(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/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 \
@@ -24700,8 +24517,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -24740,7 +24556,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -24987,7 +24802,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -25007,25 +24833,14 @@ 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 \
- $(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/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 \
@@ -25041,8 +24856,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -25081,7 +24895,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -25244,7 +25057,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -25264,25 +25088,14 @@ 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 \
- $(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/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 \
@@ -25298,8 +25111,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -25338,7 +25150,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -25539,7 +25350,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -25556,25 +25378,14 @@ 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 \
- $(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/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 \
@@ -25590,8 +25401,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -25630,7 +25440,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -25867,7 +25676,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -25887,25 +25707,14 @@ 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 \
- $(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/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 \
@@ -25921,8 +25730,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -25961,7 +25769,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -26204,7 +26011,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -26224,25 +26042,14 @@ 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 \
- $(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/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 \
@@ -26258,8 +26065,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -26298,7 +26104,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -26524,7 +26329,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -26544,25 +26360,14 @@ 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 \
- $(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/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 \
@@ -26578,8 +26383,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -26618,7 +26422,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -26858,7 +26661,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -26878,25 +26692,14 @@ 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 \
- $(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/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 \
@@ -26905,8 +26708,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -26945,7 +26747,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -27164,7 +26965,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -27184,25 +26996,14 @@ 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 \
- $(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/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 \
@@ -27211,8 +27012,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -27251,7 +27051,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -27459,7 +27258,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -27479,25 +27289,14 @@ 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 \
- $(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/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 \
@@ -27506,8 +27305,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -27546,7 +27344,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -27746,7 +27543,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -27766,25 +27574,14 @@ 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 \
- $(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/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 \
@@ -27800,8 +27597,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -27840,7 +27636,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -28058,7 +27853,18 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
  $(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 \
@@ -28078,25 +27884,14 @@ 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 \
- $(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/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 \
@@ -28112,8 +27907,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -28152,7 +27946,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -28330,7 +28123,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -28350,25 +28154,14 @@ 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 \
- $(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/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 \
@@ -28384,8 +28177,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -28424,7 +28216,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -28605,7 +28396,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -28625,25 +28427,14 @@ 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 \
- $(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/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 \
@@ -28659,8 +28450,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -28699,7 +28489,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -28864,7 +28653,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -28884,25 +28684,14 @@ 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 \
- $(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/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 \
@@ -28918,8 +28707,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -28958,7 +28746,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -29147,7 +28934,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -29164,25 +28962,14 @@ 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 \
- $(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/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 \
@@ -29198,8 +28985,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -29238,7 +29024,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -29407,7 +29192,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -29427,25 +29223,14 @@ 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 \
- $(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/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 \
@@ -29461,8 +29246,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -29501,7 +29285,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -29671,7 +29454,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -29691,25 +29485,14 @@ 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 \
- $(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/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 \
@@ -29725,8 +29508,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -29765,7 +29547,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -29938,7 +29719,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -29955,25 +29747,14 @@ 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 \
- $(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/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 \
@@ -29989,8 +29770,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -30029,7 +29809,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -30201,7 +29980,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -30218,25 +30008,14 @@ 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 \
- $(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/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 \
@@ -30252,8 +30031,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -30292,7 +30070,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -30463,7 +30240,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -30483,25 +30271,14 @@ 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 \
- $(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/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 \
@@ -30517,8 +30294,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -30557,7 +30333,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -30741,7 +30516,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -30761,25 +30547,14 @@ 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 \
- $(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/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 \
@@ -30795,8 +30570,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -30835,7 +30609,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -31020,7 +30793,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -31040,25 +30824,14 @@ 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 \
- $(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/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 \
@@ -31074,8 +30847,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -31114,7 +30886,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -31307,7 +31078,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -31327,25 +31109,14 @@ 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 \
- $(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/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 \
@@ -31361,8 +31132,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -31401,7 +31171,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -31586,7 +31355,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -31606,25 +31386,14 @@ 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 \
- $(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/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 \
@@ -31640,8 +31409,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -31680,7 +31448,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -31865,7 +31632,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -31885,25 +31663,14 @@ 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 \
- $(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/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 \
@@ -31919,8 +31686,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -31959,7 +31725,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -32142,7 +31907,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -32162,25 +31938,14 @@ 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 \
- $(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/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 \
@@ -32196,8 +31961,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -32236,7 +32000,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -32418,7 +32181,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -32438,25 +32212,14 @@ 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 \
- $(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/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 \
@@ -32472,8 +32235,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -32512,7 +32274,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -32693,7 +32454,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -32713,25 +32485,14 @@ 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 \
- $(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/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 \
@@ -32747,8 +32508,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -32787,7 +32547,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -32970,7 +32729,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -32990,25 +32760,14 @@ 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 \
- $(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/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 \
@@ -33024,8 +32783,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -33064,7 +32822,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -33258,7 +33015,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -33278,25 +33046,14 @@ 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 \
- $(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/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 \
@@ -33312,8 +33069,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -33352,7 +33108,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -33543,7 +33298,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -33563,25 +33329,14 @@ 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 \
- $(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/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 \
@@ -33597,8 +33352,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -33637,7 +33391,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -33830,7 +33583,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -33850,25 +33614,14 @@ 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 \
- $(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/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 \
@@ -33884,8 +33637,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -33924,7 +33676,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -34106,7 +33857,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -34126,25 +33888,14 @@ 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 \
- $(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/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 \
@@ -34160,8 +33911,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -34200,7 +33950,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -34364,7 +34113,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -34384,25 +34144,14 @@ 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 \
- $(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/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 \
@@ -34418,8 +34167,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -34458,7 +34206,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -34622,7 +34369,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -34642,25 +34400,14 @@ 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 \
- $(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/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 \
@@ -34676,8 +34423,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -34716,7 +34462,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -34883,7 +34628,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -34903,25 +34659,14 @@ 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 \
- $(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/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 \
@@ -34937,8 +34682,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -34977,7 +34721,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -35145,7 +34888,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -35165,25 +34919,14 @@ 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 \
- $(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/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 \
@@ -35199,8 +34942,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -35239,7 +34981,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -35406,7 +35147,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -35426,25 +35178,14 @@ 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 \
- $(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/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 \
@@ -35460,8 +35201,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -35500,7 +35240,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -35672,7 +35411,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -35692,25 +35442,14 @@ 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 \
- $(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/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 \
@@ -35726,8 +35465,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -35766,7 +35504,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -35938,7 +35675,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -35958,25 +35706,14 @@ 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 \
- $(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/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 \
@@ -35985,8 +35722,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -36025,7 +35761,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -36200,7 +35935,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -36220,25 +35966,14 @@ 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 \
- $(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/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 \
@@ -36254,8 +35989,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -36294,7 +36028,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -36501,7 +36234,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -36521,25 +36265,14 @@ 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 \
- $(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/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 \
@@ -36548,8 +36281,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -36588,7 +36320,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -36773,7 +36504,16 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -36795,21 +36535,12 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
@@ -36818,8 +36549,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -36858,7 +36588,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -37039,7 +36768,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -37059,25 +36799,14 @@ 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 \
- $(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/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 \
@@ -37086,8 +36815,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -37126,7 +36854,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -37319,7 +37046,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -37339,25 +37077,14 @@ 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 \
- $(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/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 \
@@ -37373,8 +37100,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -37413,7 +37139,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -37593,7 +37318,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -37613,25 +37349,14 @@ 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 \
- $(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/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 \
@@ -37647,8 +37372,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -37687,7 +37411,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -37857,7 +37580,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -37877,25 +37611,14 @@ 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 \
- $(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/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 \
@@ -37911,8 +37634,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -37951,7 +37673,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -37968,10 +37689,10 @@ 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 \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ Naming/Entries.h
+.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 \
  $(ACE_ROOT)/ace/streams.h \
@@ -37981,23 +37702,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/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- 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 \
- $(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 \
@@ -38012,33 +37728,58 @@ 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)/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 \
@@ -38050,32 +37791,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 \
- $(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 \
@@ -38122,7 +37837,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -38142,25 +37868,14 @@ 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 \
- $(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/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 \
@@ -38176,8 +37891,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -38216,7 +37930,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -38228,16 +37941,10 @@ 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/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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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 \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -38254,8 +37961,7 @@ ORBSVCS_COMPONENTS:
  $(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 \
+ Naming/Persistent_Naming_Context.h Naming/Naming_Context.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -38390,7 +38096,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -38410,25 +38127,14 @@ 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 \
- $(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/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 \
@@ -38444,8 +38150,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -38484,7 +38189,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -38502,8 +38206,9 @@ ORBSVCS_COMPONENTS:
  $(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
+ Naming/Persistent_Bindings_Map.h Naming/Persistent_Entries.h \
+ Naming/Shared_Hash_Map_T.h Naming/Shared_Hash_Map_T.cpp \
+ Naming/Persistent_Context_Index.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 \
@@ -38651,7 +38356,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -38671,25 +38387,14 @@ 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 \
- $(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/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 \
@@ -38705,8 +38410,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -38745,7 +38449,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -38761,8 +38464,9 @@ ORBSVCS_COMPONENTS:
  $(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
-.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_Bindings_Map.o .obj/Persistent_Bindings_Map.so .shobj/Persistent_Bindings_Map.o .shobj/Persistent_Bindings_Map.so: Naming/Persistent_Bindings_Map.cpp \
+ Naming/Persistent_Bindings_Map.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 \
@@ -38776,14 +38480,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 \
@@ -38798,58 +38501,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 \
@@ -38861,6 +38539,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 \
@@ -38907,7 +38611,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -38927,25 +38642,14 @@ 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 \
- $(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/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 \
@@ -38961,8 +38665,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -39001,7 +38704,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -39015,7 +38717,8 @@ ORBSVCS_COMPONENTS:
  $(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/CosNamingC.i \
+ Naming/Shared_Hash_Map_T.h Naming/Shared_Hash_Map_T.cpp
 .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 \
@@ -39163,7 +38866,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -39183,25 +38897,14 @@ 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 \
- $(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/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 \
@@ -39217,8 +38920,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -39257,7 +38959,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -39272,17 +38973,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 \
- $(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 \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ Naming/Shared_Hash_Map_T.h Naming/Shared_Hash_Map_T.cpp
 .obj/Naming_Utils.o .obj/Naming_Utils.so .shobj/Naming_Utils.o .shobj/Naming_Utils.so: Naming/Naming_Utils.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -39430,7 +39121,18 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -39450,25 +39152,14 @@ 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 \
- $(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/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 \
@@ -39484,8 +39175,7 @@ ORBSVCS_COMPONENTS:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -39524,7 +39214,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -39559,10 +39248,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
  $(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/Hash_Naming_Context.h Naming/Entries.h \
+ Naming/Persistent_Context_Index_T.h Naming/Persistent_Context_Index.h \
  Naming/Persistent_Entries.h Naming/Shared_Hash_Map_T.h \
- Naming/Shared_Hash_Map_T.cpp \
+ Naming/Shared_Hash_Map_T.cpp Naming/Persistent_Context_Index_T.cpp \
+ Naming/Persistent_Naming_Context.h Naming/Persistent_Bindings_Map.h \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
deleted file mode 100644
index 52b5de70b38..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// $Id$
-
-#ifndef TAO_BINDINGS_ITERATOR_T_CPP
-#define TAO_BINDINGS_ITERATOR_T_CPP
-
-#include "Bindings_Iterator_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template <class ITERATOR, class TABLE_ENTRY>
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::TAO_Bindings_Iterator (ITERATOR *hash_iter,
-                                                                     PortableServer::POA_ptr poa,
-                                                                     ACE_SYNCH_RECURSIVE_MUTEX &lock)
-  : destroyed_ (0),
-    hash_iter_ (hash_iter),
-    lock_ (lock),
-    poa_ (PortableServer::POA::_duplicate (poa))
-
-{
-}
-
-template <class ITERATOR, class TABLE_ENTRY>
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
-{
-  delete hash_iter_;
-}
-
-// Return the Default POA of this Servant
-template <class ITERATOR, class TABLE_ENTRY> PortableServer::POA_ptr
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (CORBA::Environment &/*env*/)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b,
-                                                        CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CosNaming::Binding *binding;
-
-  // Allocate a binding to be returned (even if there no more
-  // bindings, we need to allocate an out parameter.)
-  ACE_NEW_THROW_EX (binding,
-                    CosNaming::Binding,
-                    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,
-                      ace_mon,
-                      this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-  // If there are no more bindings.
-  if (hash_iter_->done ())
-    return 0;
-  else
-    {
-      TABLE_ENTRY *hash_entry;
-      hash_iter_->next (hash_entry);
-
-      if (populate_binding (hash_entry, *binding) == 0)
-        ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
-
-      hash_iter_->advance ();
-      return 1;
-    }
-}
-
-template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many,
-                                                      CosNaming::BindingList_out bl,
-                                                      CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // We perform an allocation before obtaining the lock so that an out
-  // parameter is allocated in case we fail to obtain the lock.
-  ACE_NEW_THROW_EX (bl,
-                    CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-  // 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 didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-
-  // If there are no more bindings...
-  if (hash_iter_->done ())
-      return 0;
-  else
-    {
-      // 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);
-
-          if (populate_binding (hash_entry, bl[i]) == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
-
-          if (hash_iter_->advance () == 0)
-            {
-              // 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;
-            }
-        }
-      return 1;
-    }
-}
-
-template <class ITERATOR, class TABLE_ENTRY> void
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
-                      ace_mon,
-                      this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
-
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
-  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;
-}
-
-template <class ITERATOR, class TABLE_ENTRY> int
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding (TABLE_ENTRY *hash_entry,
-                                                                CosNaming::Binding &b)
-{
-  b.binding_type = hash_entry->int_id_.type_;
-  b.binding_name.length (1);
-
-  // Here we perform a check before assignment to make sure
-  // CORBA::string_dup is not called on 0 pointer, since the spec does
-  // not say what should happen in that case.
-  if (hash_entry->ext_id_.id () != 0)
-    {
-      b.binding_name[0].id =
-        hash_entry->ext_id_.id ();
-      if (b.binding_name[0].id.in () == 0)
-        return 0;
-    }
-  if (hash_entry->ext_id_.kind () != 0)
-    {
-      b.binding_name[0].kind =
-        hash_entry->ext_id_.kind ();
-      if (b.binding_name[0].kind.in () == 0)
-        return 0;
-    }
-  return 1;
-}
-
-#endif /* TAO_BINDINGS_ITERATOR_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
deleted file mode 100644
index 95bffc2582e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Hash_Binding_Iterator_T.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_BINDINGS_ITERATOR_T_H
-#define TAO_BINDINGS_ITERATOR_T_H
-
-#include "orbsvcs/CosNamingS.h"
-
-template <class ITERATOR, class TABLE_ENTRY>
-class TAO_Bindings_Iterator : public virtual PortableServer::RefCountServantBase,
-                              public virtual POA_CosNaming::BindingIterator
-{
-  // = TITLE
-  //     This class implements the <BindingIterator> interface that is
-  //     part of the <CosNaming> idl module based on the Hash_Map
-  //     implementation for CosNaming::NamingContext.
-  //
-  // = DESCRIPTION
-  //     <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 (ITERATOR *hash_iter,
-                         PortableServer::POA_ptr poa,
-                         ACE_SYNCH_RECURSIVE_MUTEX &lock);
-  // Constructor.
-
-  ~TAO_Bindings_Iterator (void);
-  // Destructor.
-
-  // Returns the Default POA of this Servant object
-  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 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 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_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_;
-
-  ITERATOR *hash_iter_;
-  // A pointer to the hash map iterator.
-
-  ACE_SYNCH_RECURSIVE_MUTEX &lock_;
-  // Lock passed on from <TAO_NamingContext> to serialize access to the
-  // internal data structure.
-
-  PortableServer::POA_var poa_;
-  // Implement a different _default_POA()
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Bindings_Iterator_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Bindings_Iterator_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_BINDINGS_ITERATOR_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
index 282bf055503..a6795aafdd3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
@@ -77,18 +77,6 @@ TAO_ExtId::~TAO_ExtId (void)
 {
 }
 
-const char *
-TAO_ExtId::id (void)
-{
-  return id_.fast_rep ();
-}
-
-const char *
-TAO_ExtId::kind (void)
-{
-  return kind_.fast_rep ();
-}
-
 void
 TAO_ExtId::operator= (const TAO_ExtId &rhs)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
index b22550d89ee..e00e504723b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -104,11 +104,6 @@ public:
 
   ACE_CString id_;
   // 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 e140e87bdb4..75622f13e48 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -17,18 +17,33 @@
 
 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),
-    destroyed_ (0),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    poa_id_ (poa_id)
+TAO_Hash_Naming_Context::TAO_Hash_Naming_Context (TAO_Naming_Context *interface,
+                                                  PortableServer::POA_ptr poa,
+                                                  const char *poa_id,
+                                                  size_t default_hash_table_size,
+                                                  int root)
+  : poa_ (PortableServer::POA::_duplicate (poa)),
+    counter_ (0),
+    poa_id_ (poa_id),
+    context_ (default_hash_table_size),
+    root_ (root),
+    lock_ (0),
+    hash_table_size_ (default_hash_table_size),
+    interface_ (interface)
 {
+  // Get the lock from the ORB, which knows what type is appropriate.
+  // This method must be called AFTER the ORB has been initialized via
+  // <CORBA::ORB_init> since otherwise <TAO_ORB_Core_instance> won't
+  // work correctly...
+  ACE_ALLOCATOR (this->lock_,
+                 TAO_ORB_Core_instance ()->server_factory ()->create_servant_lock ());
+
+  interface_->impl (this);
 }
 
 TAO_Hash_Naming_Context::~TAO_Hash_Naming_Context (void)
 {
-  delete context_;
+  delete this->lock_;
 }
 
 PortableServer::POA_ptr
@@ -41,16 +56,16 @@ CosNaming::NamingContext_ptr
 TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
                                       CORBA::Environment &ACE_TRY_ENV)
 {
-  // Naming context we will return.
+  // The naming context we will return.
   CosNaming::NamingContext_var result =
     CosNaming::NamingContext::_nil ();
 
-  // Create compound name to be resolved, i.e.,
-  // (<name> - last component).  To avoid copying, we can just reuse
+  // Create compound name to be resolved (<name> - last component).
+  // To avoid copying (and thus memory allocations), we can just reuse
   // <name>'s buffer, since we will not be modifying it.
-  CORBA::ULong name_len = name.length ();
+  CORBA::ULong len = name.length ();
   CosNaming::Name comp_name (name.maximum (),
-                             name_len - 1,
+                             len - 1,
                              ACE_const_cast
                              (CosNaming::NameComponent*,
                               name.get_buffer ()));
@@ -61,7 +76,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
                                            ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Try narrowing object reference to the NamingContext type.
+      // Try narrowing object reference to a context type.
       result = CosNaming::NamingContext::_narrow (context.in (),
                                                   ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -70,9 +85,9 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
     {
       // Add the last component of the name, which was stripped before
       // the call to resolve.
-      CORBA::ULong rest_len = ex.rest_of_name.length () + 1;
-      ex.rest_of_name.length (rest_len);
-      ex.rest_of_name[rest_len - 1] = name[name_len - 1];
+      CORBA::ULong rest_len = ex.rest_of_name.length ();
+      ex.rest_of_name.length (rest_len + 1);
+      ex.rest_of_name[rest_len] = name[len - 1];
 
       if (ex.why == CosNaming::NamingContext::not_object)
         ex.why = CosNaming::NamingContext::missing_node;
@@ -80,18 +95,20 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
       ACE_RETHROW;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  ACE_CHECK_RETURN (result._retn ());
 
+  // This has to be outside the TRY block, othewise we'll catch our
+  // own exception.
   if (CORBA::is_nil (result.in ()))
     {
       CosNaming::Name rest;
       rest.length (2);
-      rest[0] = name[name_len - 2];
-      rest[1] = name[name_len - 1];
+      rest[0] = name[len - 2];
+      rest[1] = name[len - 1];
       ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
                         (CosNaming::NamingContext::not_context,
                          rest),
-                        CosNaming::NamingContext::_nil ());
+                        result._retn());
     }
   // Finally, if everything went smoothly, just return the resolved
   // context.
@@ -103,27 +120,22 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
                                CORBA::Object_ptr obj,
                                CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
-                      ace_mon, this->lock_,
+  ACE_GUARD_THROW_EX (ACE_Lock,
+                      ace_mon, *this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong len = n.length ();
 
   // Check for invalid name.
-  if (name_len == 0)
+  if (len == 0)
     ACE_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding on
   // target context.
-  if (name_len > 1)
+  if (len > 1)
     {
       CosNaming::NamingContext_var context =
         this->get_context (n, ACE_TRY_ENV);
@@ -131,18 +143,18 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
 
       CosNaming::Name simple_name;
       simple_name.length (1);
-      simple_name[0] = n[name_len - 1];
+      simple_name[0] = n[len - 1];
       context->bind (simple_name, obj, ACE_TRY_ENV);
       ACE_CHECK;
     }
   // If we received a simple name, we need to bind it in this context.
   else
     {
+      TAO_IntId entry (obj, CosNaming::nobject);
+      TAO_ExtId name (n[0].id, n[0].kind);
+
       // Try binding the name.
-      int result = this->context_->bind (n[0].id,
-                                        n[0].kind,
-                                        obj,
-                                        CosNaming::nobject);
+      int result = this->context_.bind (name, entry);
       if (result == 1)
         ACE_THROW (CosNaming::NamingContext::AlreadyBound());
 
@@ -157,27 +169,22 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
                                  CORBA::Object_ptr obj,
                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
-                      this->lock_,
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
+                      *this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong len = n.length ();
 
   // Check for invalid name.
-  if (name_len == 0)
+  if (len == 0)
     ACE_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
   // on target context.
-  if (name_len > 1)
+  if (len > 1)
     {
       CosNaming::NamingContext_var context =
         get_context (n, ACE_TRY_ENV);
@@ -185,19 +192,29 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
 
       CosNaming::Name simple_name;
       simple_name.length (1);
-      simple_name[0] = n[name_len - 1];
+      simple_name[0] = n[len - 1];
       context->rebind (simple_name, obj, ACE_TRY_ENV);
       ACE_CHECK;
     }
   else
-    // If we received a simple name, we need to rebind it in this
-    // context.
-    if (this->context_->rebind (n[0].id,
-                               n[0].kind,
-                               obj,
-                               CosNaming::nobject)
-        == -1)
-      ACE_THROW (CORBA::INTERNAL ());
+    {
+      // If we received a simple name, we need to rebind it in this
+      // context.
+
+      TAO_IntId entry (obj, CosNaming::nobject);
+      TAO_ExtId name (n[0].id, n[0].kind);
+      TAO_IntId oldentry;
+      TAO_ExtId oldname;
+
+      // Try rebinding the name.
+      int result = this->context_.rebind (name,
+                                          entry,
+                                          oldname,
+                                          oldentry);
+      // Something went wrong with the internal structure
+      if (result == -1)
+        ACE_THROW (CORBA::INTERNAL ());
+    }
 }
 
 void
@@ -205,27 +222,22 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
                                        CosNaming::NamingContext_ptr nc,
                                        CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
-                      this->lock_,
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
+                      *this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong len = n.length ();
 
   // Check for invalid name.
-  if (name_len == 0)
+  if (len == 0)
     ACE_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding on
   // target context.
-  if (name_len > 1)
+  if (len > 1)
     {
       CosNaming::NamingContext_var context =
         get_context (n, ACE_TRY_ENV);
@@ -233,18 +245,18 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
 
       CosNaming::Name simple_name;
       simple_name.length (1);
-      simple_name[0] = n[name_len - 1];
+      simple_name[0] = n[len - 1];
       context->bind_context (simple_name, nc, ACE_TRY_ENV);
       ACE_CHECK;
     }
   // If we received a simple name, we need to bind it in this context.
   else
     {
+      TAO_IntId entry (nc, CosNaming::ncontext);
+      TAO_ExtId name (n[0].id, n[0].kind);
+
       // Try binding the name.
-      int result = this->context_->bind (n[0].id,
-                                        n[0].kind,
-                                        nc,
-                                        CosNaming::ncontext);
+      int result = this->context_.bind (name, entry);
       if (result == 1)
         ACE_THROW (CosNaming::NamingContext::AlreadyBound());
 
@@ -259,27 +271,22 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
                                          CosNaming::NamingContext_ptr nc,
                                          CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
-                      this->lock_,
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
+                      *this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong len = n.length ();
 
   // Check for invalid name.
-  if (name_len == 0)
+  if (len == 0)
     ACE_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
   // on target context.
-  if (name_len > 1)
+  if (len > 1)
     {
       CosNaming::NamingContext_var context =
         get_context (n, ACE_TRY_ENV);
@@ -287,92 +294,83 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
 
       CosNaming::Name simple_name;
       simple_name.length (1);
-      simple_name[0] = n[name_len - 1];
+      simple_name[0] = n[len - 1];
       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 (this->context_->rebind (n[0].id,
-                               n[0].kind,
-                               nc,
-                               CosNaming::ncontext) < 0)
-      ACE_THROW (CORBA::INTERNAL ());
+    {
+      TAO_IntId entry (nc, CosNaming::ncontext);
+      TAO_ExtId name (n[0].id, n[0].kind);
+      TAO_IntId oldentry;
+      TAO_ExtId oldname;
+
+      // Try rebinding the name.
+      if (this->context_.rebind (name,
+                                 entry,
+                                 oldname,
+                                 oldentry) < 0)
+        ACE_THROW (CORBA::INTERNAL ());
+    }
 }
 
 CORBA::Object_ptr
 TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_,
+  CORBA::Object_ptr result = CORBA::Object::_nil ();
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                       CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CORBA::Object::_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 (),
-                      CORBA::Object::_nil ());
+  ACE_CHECK_RETURN (result);
 
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong len = n.length ();
 
   // Check for invalid name.
-  if (name_len == 0)
+  if (len == 0)
     ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
-                      CORBA::Object::_nil ());
+                      result);
 
   // Resolve the first component of the name.
+  TAO_ExtId name (n[0].id, n[0].kind);
+  TAO_IntId entry;
 
-  // Stores the binding type for the first name component.
-  CosNaming::BindingType type;
-  // Stores the object reference bound to the first name component.
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  if (this->context_->find (n[0].id,
-                            n[0].kind,
-                            obj,
-                            type) == -1)
+  if (this->context_.find (name,
+                           entry) == -1)
     ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
                       (CosNaming::NamingContext::not_object,
                        n),
-                      CORBA::Object::_nil ());
+                      result);
+  result = entry.ref_;
 
-  // Store the value in var to avoid memory leaks.
-  CORBA::Object_var result = obj;
+  //@@ Once TAO_TRY_THROW is implemented, the whole if (len > 1) can be put in a try block
+  //with rethrow in CATCHANY.
 
-  // If the name we have to resolve is a compound name, we need to
-  // resolve it recursively.
-  if (name_len > 1)
+  // If the name we have to resolve is a compound name we need to
+  // recursively resolve it.
+  if (len > 1)
     {
       CosNaming::NamingContext_var context =
         CosNaming::NamingContext::_nil ();
-
-      if (type == CosNaming::ncontext)
+      if (entry.type_ == CosNaming::ncontext)
         {
-          // Narrow to NamingContext.
-          context = CosNaming::NamingContext::_narrow (result.in (),
+          context = CosNaming::NamingContext::_narrow (result,
                                                        ACE_TRY_ENV);
-          ACE_CHECK_RETURN (result._retn ());
+          ACE_CHECK_RETURN (context._retn ());
         }
       else
-        // The first name component wasn't bound to a NamingContext.
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                          (CosNaming::NamingContext::not_context,
-                           n),
-                          CORBA::Object::_nil ());
-
-      // If narrow failed...
+        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
+                                                              n),
+                          context._retn ());
       if (CORBA::is_nil (context.in ()))
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                          (CosNaming::NamingContext::not_context,
-                           n),
-                          CORBA::Object::_nil ());
+        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
+                                                              n),
+                          context._retn ());
       else
         {
-          // Successfully resolved the first name component, need to
-          // recursively call resolve on <n> without the first component.
+          // Recursively call resolve on <n> without the first component.
 
           // We need a name just like <n> but without the first
           // component.  Instead of copying data we can reuse <n>'s
@@ -384,42 +382,36 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
              ACE_const_cast (CosNaming::NameComponent*,
                              n.get_buffer ())
              + 1);
-
           // If there are any exceptions, they will propagate up.
           return context->resolve (rest_of_name,
                                    ACE_TRY_ENV);
         }
     }
   // If the name we had to resolve was simple, we just need to return
-  // the result.
-  return result._retn ();
+  // the result.  Since we don't want the result to be destroyed when
+  // this method returns we need to duplicate it.
+  return CORBA::Object::_duplicate (result);
 }
 
 void
 TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n,
                                  CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon,
-                      this->lock_,
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
   // Get the length of the name.
-  CORBA::ULong name_len = n.length ();
+  CORBA::ULong len = n.length ();
 
   // Check for invalid name.
-  if (name_len == 0)
+  if (len == 0)
     ACE_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the unbinding should take place, then perform the unbinding
   // on target context.
-  if (name_len > 1)
+  if (len > 1)
     {
       CosNaming::NamingContext_var context =
         get_context (n, ACE_TRY_ENV);
@@ -427,45 +419,105 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n,
 
       CosNaming::Name simple_name;
       simple_name.length (1);
-      simple_name[0] = n[name_len - 1];
+      simple_name[0] = n[len - 1];
       context->unbind (simple_name, ACE_TRY_ENV);
       ACE_CHECK;
     }
   // If we received a simple name, we need to unbind it in this
   // context.
   else
-    if (this->context_->unbind (n[0].id,
-                                n[0].kind) == -1)
-      ACE_THROW (CosNaming::NamingContext::NotFound
-                 (CosNaming::NamingContext::not_object,
-                  n));
+    {
+      TAO_ExtId name (n[0].id, n[0].kind);
+      // Try unbinding the name.
+      if (this->context_.unbind (name) == -1)
+        ACE_THROW (CosNaming::NamingContext::NotFound
+                   (CosNaming::NamingContext::not_object,
+                    n));
+    }
+}
+
+CosNaming::NamingContext_ptr
+TAO_Hash_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
+{
+  ACE_GUARD_THROW_EX (ACE_Lock,
+                      ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+
+  TAO_Hash_Naming_Context *c_impl = 0;
+
+  // To keep compilers warnings away.
+  ACE_UNUSED_ARG (c_impl);
+
+  TAO_Naming_Context *c = 0;
+  CosNaming::NamingContext_var result;
+  char poa_id[BUFSIZ];
+  ACE_OS::sprintf (poa_id,
+                   "%s_%ld",
+                   this->poa_id_.c_str (),
+                   this->counter_++);
+
+  ACE_NEW_THROW_EX (c,
+                    TAO_Naming_Context,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (result._retn ());
+
+  // Put <c> into the auto pointer temporarily, in case next
+  // allocation fails.
+  ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
+
+  ACE_NEW_THROW_EX (c_impl,
+                    TAO_Hash_Naming_Context (c,
+                                             poa_.in (),
+                                             poa_id,
+                                             this->hash_table_size_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (result._retn ());
+
+  // Allocation succeeded, get rid of auto pointer.
+  temp.release ();
+
+  ACE_TRY
+    {
+      PortableServer::ObjectId_var id =
+        PortableServer::string_to_ObjectId (poa_id);
+
+      this->poa_->activate_object_with_id (id.in (),
+                                           c,
+                                           ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      result = c->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      delete c;
+      ACE_RETHROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (result._retn ());
+
+  return result._retn ();
 }
 
 CosNaming::NamingContext_ptr
 TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n,
                                            CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
+  ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
-                      this->lock_,
+                      *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 ());
-
-  // Stores our new Naming Context.
   CosNaming::NamingContext_var result =
     CosNaming::NamingContext::_nil ();
 
-  // Create new context.
   result = new_context (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
-  // Bind the new context to the name.
   ACE_TRY
     {
       bind_context (n,
@@ -490,47 +542,343 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n,
 void
 TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
+  {
+    ACE_GUARD_THROW_EX (ACE_Lock,
+                        ace_mon,
+                        *this->lock_,
+                        CORBA::INTERNAL ());
+    ACE_CHECK;
+
+    if (this->context_.current_size () != 0)
+      ACE_THROW (CosNaming::NamingContext::NotEmpty());
+
+    if (this->root_ != 0)
+      return; // Destroy is a no-op on a root context.
+    else
+      {
+        PortableServer::POA_var poa =
+          this->_default_POA ();
+
+        PortableServer::ObjectId_var id =
+          poa->servant_to_id (interface_,
+                              ACE_TRY_ENV);
+        ACE_CHECK;
+
+        poa->deactivate_object (id.in (),
+                                ACE_TRY_ENV);
+        ACE_CHECK;
+      }
+  }
+
+  // Let go of the lock and kill the interface, which will, in turn,
+  // invoke our destructor.  We *must* be dynamically allocated for this to work right...
+  // The code below, and in <destroy> in general, should NOT be
+  // factored into the TAO_Naming_Context, because only the *concrete
+  // implementation* knows how to clean up appropriately, e.g., we may
+  // have one servant serving many objects and will not want to delete
+  // the servant in <destroy>.
+
+  //@@ Now that the POA has been fixed to work right, this is no
+  // longer a correct approach to disposing off the servants.  This is
+  // a temporary fix to avoid crashing (but with the memory leak), a
+  // proper fix will be in the next release.
+
+  //if (this->root_ == 0)
+  //delete interface_;
+}
+
+void
+TAO_Hash_Naming_Context::list (CORBA::ULong how_many,
+                               CosNaming::BindingList_out &bl,
+                               CosNaming::BindingIterator_out &bi,
+                               CORBA::Environment &ACE_TRY_ENV)
+{
+  // Allocate nil out parameters in case we won't be able to complete
+  // the operation.
+  bi = CosNaming::BindingIterator::_nil ();
+  ACE_NEW_THROW_EX (bl,
+                    CosNaming::BindingList (0),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  // Obtain a lock before we proceed with the operation.
+  ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
-                      this->lock_,
+                      *this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+  // Dynamically allocate hash map iterator.
+  TAO_Hash_Naming_Context::HASH_MAP::ITERATOR *hash_iter = 0;
+  ACE_NEW_THROW_EX (hash_iter,
+                    TAO_Hash_Naming_Context::HASH_MAP::ITERATOR (context_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  // Number of bindings that will go into the BindingList.
+  CORBA::ULong n;
 
-  if (this->context_->current_size () != 0)
-    ACE_THROW (CosNaming::NamingContext::NotEmpty());
+  // A pointer to BindingIterator servant.
+  TAO_Hash_Binding_Iterator *bind_iter = 0;
 
-  // Destroy is a no-op on a root context.
-  if (root ())
-    return;
+  // Calculate number of bindings that will go into bl.
+  if (this->context_.current_size () > how_many)
+    n = how_many;
+  else
+    n = this->context_.current_size ();
+
+  // Use hash iterator to populate a BindingList with bindings.
+  bl->length (n);
+
+  TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry;
+
+  for (CORBA::ULong i = 0; i < n; i++)
+    {
+      hash_iter->next (hash_entry);
+      hash_iter->advance ();
+
+      if (populate_binding (hash_entry, bl[i]) == 0)
+        {
+          delete hash_iter;
+          ACE_THROW (CORBA::NO_MEMORY());
+        }
+    }
 
+  // Now we are done with the BindingsList, and we can follow up on
+  // the iterator business.
+
+  // If we do not need to pass back BindingIterator.
+  if (this->context_.current_size () <= how_many)
+    delete hash_iter;
   else
     {
-      // Remove self from POA.  Because of reference counting, the POA
-      // will automatically delete the servant when all pending requests
-      // on this servant are complete.
+      // Create a BindingIterator for return.
 
-      PortableServer::POA_var poa =
-        this->_default_POA ();
+      bind_iter = new TAO_Hash_Binding_Iterator (hash_iter, this->poa_.in (), this->lock_);
+      if (bind_iter == 0)
+        {
+          delete hash_iter;
+          ACE_THROW (CORBA::NO_MEMORY ());
+        }
 
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId (poa_id_.fast_rep ());
+      ACE_TRY
+        {
+          char poa_id[BUFSIZ];
+          ACE_OS::sprintf (poa_id,
+                           "%s_%ld",
+                           this->poa_id_.c_str (),
+                           this->counter_++);
 
-      ACE_CHECK;
+          PortableServer::ObjectId_var id =
+            PortableServer::string_to_ObjectId (poa_id);
 
-      poa->deactivate_object (id.in (),
-                              ACE_TRY_ENV);
+          this->poa_->activate_object_with_id (id.in (),
+                                               bind_iter,
+                                               ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          bi = bind_iter->_this (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+        }
+      ACE_CATCHANY
+        {
+          delete bind_iter;
+          ACE_RETHROW;
+        }
+      ACE_ENDTRY;
       ACE_CHECK;
     }
 }
 
+TAO_Hash_Binding_Iterator::TAO_Hash_Binding_Iterator (TAO_Hash_Naming_Context::HASH_MAP::ITERATOR *hash_iter,
+                                                      PortableServer::POA_ptr poa,
+                                                      ACE_Lock *lock)
+  : hash_iter_ (hash_iter),
+    lock_ (lock),
+    poa_ (PortableServer::POA::_duplicate (poa))
+
+{
+}
+
+TAO_Hash_Binding_Iterator::~TAO_Hash_Binding_Iterator (void)
+{
+  delete hash_iter_;
+}
+
+// Return the Default POA of this Servant
+PortableServer::POA_ptr
+TAO_Hash_Binding_Iterator::_default_POA (CORBA::Environment &/*env*/)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
+CORBA::Boolean
+TAO_Hash_Binding_Iterator::next_one (CosNaming::Binding_out b,
+                                     CORBA::Environment &ACE_TRY_ENV)
+{
+  CosNaming::Binding *binding;
+
+  // Allocate a binding to be returned (even if there no more
+  // bindings, we need to allocate an out parameter.)
+  ACE_NEW_THROW_EX (binding,
+                    CosNaming::Binding,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+  b = binding;
+
+  ACE_GUARD_THROW_EX (ACE_Lock,
+                      ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+  // If there are no more bindings.
+  if (hash_iter_->done ())
+    return 0;
+  else
+    {
+      TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry;
+      hash_iter_->next (hash_entry);
+
+      if (TAO_Hash_Naming_Context::populate_binding (hash_entry, *binding) == 0)
+        ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+
+      hash_iter_->advance ();
+      return 1;
+    }
+}
+
 int
-TAO_Hash_Naming_Context::root (void)
+TAO_Hash_Naming_Context::populate_binding (TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry,
+                                           CosNaming::Binding &b)
+{
+  b.binding_type = hash_entry->int_id_.type_;
+  b.binding_name.length (1);
+
+  // Here we perform a check before assignment to make sure
+  // CORBA::string_dup is not called on 0 pointer, since the spec does
+  // not say what should happen in that case.
+  if (hash_entry->ext_id_.id_.fast_rep () != 0)
+    {
+      b.binding_name[0].id =
+        hash_entry->ext_id_.id_.fast_rep ();
+      if (b.binding_name[0].id.in () == 0)
+        return 0;
+    }
+  if (hash_entry->ext_id_.kind_.fast_rep () != 0)
+    {
+      b.binding_name[0].kind =
+        hash_entry->ext_id_.kind_.fast_rep ();
+      if (b.binding_name[0].kind.in () == 0)
+        return 0;
+    }
+  return 1;
+}
+
+CORBA::Boolean
+TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many,
+                                   CosNaming::BindingList_out bl,
+                                   CORBA::Environment &ACE_TRY_ENV)
 {
-  return (ACE_OS::strcmp (this->poa_id_.fast_rep (),
-                          TAO_ROOT_NAMING_CONTEXT) == 0);
+  // We perform an allocation before obtaining the lock so that an out
+  // parameter is allocated in case we fail to obtain the lock.
+  ACE_NEW_THROW_EX (bl,
+                    CosNaming::BindingList (0),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+  // Obtain a lock.
+  ACE_GUARD_THROW_EX (ACE_Lock,
+                      ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
+  // If there are no more bindings...
+  if (hash_iter_->done ())
+      return 0;
+  else
+    {
+      // Initially assume that iterator has the requested number of
+      // bindings.
+      bl->length (how_many);
+
+      TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry;
+
+      // Iterate and populate the BindingList.
+
+      for (CORBA::ULong i = 0; i < how_many; i++)
+        {
+          hash_iter_->next (hash_entry);
+
+          if (TAO_Hash_Naming_Context::populate_binding (hash_entry, bl[i]) == 0)
+            ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+
+          if (hash_iter_->advance () == 0)
+            {
+              // 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;
+            }
+        }
+      return 1;
+    }
+}
+
+void
+TAO_Hash_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+{
+  {
+    ACE_GUARD_THROW_EX (ACE_Lock,
+                        ace_mon,
+                        *this->lock_,
+                        CORBA::INTERNAL ());
+    ACE_CHECK;
+
+    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;
+  }
+
+  // Let go of the lock and commit suicide: must have been dynamically allocated
+  //@@ Now that the POA has been fixed to work right, this is no
+  // longer a correct approach to disposing off the servants.  This is
+  // a temporary fix to avoid crashing (but with the memory leak), a
+  // proper fix will be in the next release.
+  //delete this;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Auto_Basic_Ptr<TAO_Hash_Naming_Context>;
+template class ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId>;
+template class ACE_Hash<TAO_ExtId>;
+template class ACE_Equal_To<TAO_ExtId>;
+template class ACE_Hash_Map_Iterator_Base_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Hash_Naming_Context>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId>
+#pragma instantiate ACE_Hash<TAO_ExtId>
+#pragma instantiate ACE_Equal_To<TAO_ExtId>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index 23602bc0459..889abc65c9e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -17,189 +17,175 @@
 #define TAO_HASH_NAMING_CONTEXT_H
 
 #include "Naming_Context.h"
+#include "Entries.h"
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
-class TAO_ORBSVCS_Export TAO_Bindings_Map
+class TAO_ORBSVCS_Export TAO_Hash_Naming_Context : public TAO_Naming_Context_Impl
 {
   // = TITLE
-  //    This abstract base class defines an interface for hash-based
-  //    data structures used in implementations of NamingContext
-  //    (i.e., TAO_Transient_Naming_Context and TAO_Persistent_Naming_Context)
+  //     This class plays a role of a 'ConcreteImplementor' in the
+  //     Bridge pattern architecture of the Naming Service
+  //     implementation.  This implementation of the NamingContext
+  //     uses ACE_Hash_Map_Manager to store name bindings.
   //
   // = DESCRIPTION
-  //    Define an interface for several hash-based data structures, so
-  //    that we can write some code that would work with any of them,
-  //    i.e., TAO_Hash_Naming_Context.
+  //     Extensive idl method descriptions can be found in Naming_Context.h
 
 public:
+  typedef ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex> HASH_MAP;
 
-  virtual size_t current_size (void) = 0;
-  // Return current number of entries (name bindings) in the
-  // underlying hash map.
-
-  virtual int bind (const char *id,
-                    const char *kind,
-                    CORBA::Object_ptr obj,
-                    CosNaming::BindingType type) = 0;
-  // Add a binding with the specified parameters to the table.
-  // Return 0 on success and -1 on failure, 1 if there already is a
-  // binding with <id> and <kind>.
-
-  virtual int rebind (const char *id,
-                      const char *kind,
-                      CORBA::Object_ptr obj,
-                      CosNaming::BindingType type) = 0;
-  // Overwrite a binding containing <id> and <kind> (or create a new
-  // one if one doesn't exist) with the specified parameters.  Returns
-  // -1 on failure.
-
-  virtual int unbind (const char * id,
-                      const char * kind) = 0;
-  // Remove a binding containing <id> and <kind> from the table.
-  // Return 0 on success and -1 on failure.
-
-  virtual int find (const char * id,
-                    const char * kind,
-                    CORBA::Object_ptr & obj,
-                    CosNaming::BindingType &type) = 0;
-  // Find the binding containing <id> and <kind> in the table, and
-  // pass binding's type and object back to the caller by reference.
-  // Return 0 on success and -1 on failure.   Note: a 'duplicated' object
-  // reference is assigned to <obj>, so the caller is responsible for
-  // its deallocation.
-
-};
-
-class TAO_ORBSVCS_Export TAO_Hash_Naming_Context :public TAO_Naming_Context_Impl
-{
-  // = TITLE
-  //     This class factors out common code for two 'ConcreteImplementors'
-  //     in the Bridge pattern architecture of the CosNaming::NamingContext
-  //     implementation.
-  //
-  // = DESCRIPTION
-  //     This class contains 'algorithm' code that is common to two
-  //     hash-table-based implementations of the NamingContext:
-  //     TAO_Transient_Naming_Context and TAO_Persistent_Naming_Context.
-  //     To help achieve this 'templatization', we use the abstract base
-  //     class TAO_Bindings_Map, which provides a common interface to the data structures
-  //     used in TAO_Persistent_Namng_Context and TAO_Transient_Naming_Context.
-  //
-public:
   // = Initialization and termination methods.
-  TAO_Hash_Naming_Context (PortableServer::POA_ptr poa,
-                           const char *poa_id);
-  // Constructor.
+  TAO_Hash_Naming_Context (TAO_Naming_Context *interface,
+                           PortableServer::POA_ptr poa,
+                           const char *poa_id,
+                           size_t default_hash_table_size = ACE_DEFAULT_MAP_SIZE,
+                           int root = 0);
+  // Default constructor, which initializes the <size> of the table,
+  // and sets a root flag.
 
   virtual ~TAO_Hash_Naming_Context (void);
-  // Destructor.
+  // destructor.
 
   // = CosNaming::NamingContext idl interface methods.
-
-  int root (void);
-  //
-
   virtual void bind (const CosNaming::Name &n,
                      CORBA::Object_ptr obj,
                      CORBA::Environment &ACE_TRY_ENV);
-  // Create a binding for name <n> and object <obj> in the naming
-  // context.  Compound names are treated as follows: ctx->bind (<c1;
-  // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
-  // obj) if the there already exists a binding for the specified
-  // name, <AlreadyBound> exception is thrown.  Naming contexts should
-  // be bound using <bind_context> and <rebind_context> in order to
-  // participate in name resolution later.
 
   virtual void rebind (const CosNaming::Name &n,
                        CORBA::Object_ptr obj,
                        CORBA::Environment &ACE_TRY_ENV);
-  // This is similar to <bind> operation above, except for when the
-  // binding for the specified name already exists in the specified
-  // context.  In that case, the existing binding is replaced with the
-  // new one.
 
   virtual void bind_context (const CosNaming::Name &n,
                              CosNaming::NamingContext_ptr nc,
                              CORBA::Environment &ACE_TRY_ENV);
-  // This is the version of <bind> specifically for binding naming
-  // contexts, so that they will participate in name resolution when
-  // compound names are passed to be resolved.
 
-   virtual void rebind_context (const CosNaming::Name &n,
+  virtual void rebind_context (const CosNaming::Name &n,
                                CosNaming::NamingContext_ptr nc,
                                CORBA::Environment &ACE_TRY_ENV);
-  // This is a version of <rebind> specifically for naming contexts,
-  // so that they can participate in name resolution when compound
-  // names are passed.
 
   virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
                                      CORBA::Environment &ACE_TRY_ENV);
-  // Return object reference that is bound to the name.  Compound name
-  // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
-  // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
-  // does not return the type of the object.  Clients are responsible
-  // for "narrowing" the object to the appropriate type.
 
   virtual void unbind (const CosNaming::Name &n,
                        CORBA::Environment &ACE_TRY_ENV);
-  // Remove the name binding from the context.  When compound names
-  // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
-  // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
+
+  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV);
 
   virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
                                                          CORBA::Environment &ACE_TRY_ENV);
-  // This operation creates a new context and binds it to the name
-  // supplied as an argument.  The newly-created context is
-  // implemented by the same server as the context in which it was
-  // bound (the name argument excluding the last component).
 
   virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
-  // Delete the naming context.  The user should take care to <unbind> any
-  // bindings in which the given context is bound to some names, to
-  // avoid dangling references when invoking <destroy> operation.
-  // NOTE: <destory> is a no-op on the root context.
-  // NOTE: after <destroy> is invoked on a Naming Context, all
-  // BindingIterators associated with that Naming Context are also destroyed.
+
+  virtual void list (CORBA::ULong how_many,
+                     CosNaming::BindingList_out &bl,
+                     CosNaming::BindingIterator_out &bi,
+                     CORBA::Environment &ACE_TRY_ENV);
 
   virtual PortableServer::POA_ptr _default_POA (void);
   // Returns the Default POA of this Servant object
 
+  // = Helper functions.
+  static int populate_binding (TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry,
+                               CosNaming::Binding &b);
+  // 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.
+
 protected:
-  // = Helper method used by other methods.
+  // = These are the helper methods used by other methods.
 
   CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name,
                                             CORBA::Environment &_env);
-  // <get_context> is used by methods that need to resolve a compound
-  // name before performing the actual operation (e.g., bind,
-  // unbind, etc.)  <get_context> takes a full name (including the
-  // last component that doesn't need to be resolved), and returns a
-  // pointer to the target context.
-
-  TAO_Bindings_Map *context_;
-  // Pointer to the data structure used to store this Naming Context's
-  // bindings.  <context_> is initialized with a concrete data
-  // structure by subclasses, which know which data structure to use.
-
-  ACE_SYNCH_RECURSIVE_MUTEX lock_;
-  // Lock used to serialize access to the underlying data structure.
-
-  int destroyed_;
-  // 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.
+  // This is used by methods that need to resolve a compound name to
+  // get the reference to the target context before performing the
+  // actual operation (e.g. bind, unbind, etc.)  Takes a full name
+  // (including the last component that doesn't need to be resolved)
+  // Returns a pointer to the target context.
 
   PortableServer::POA_var poa_;
   // POA we are registered with.
 
+  ACE_UINT32 counter_;
+  // Counter used for generation of POA ids for objects created by
+  // this context.
+
   ACE_CString poa_id_;
   // ID with which we are registered with <poa_>.
-  // Note, if <poa_id_> is equivalent to TAO_ROOT_NAMING_CONTEXT, then this Naming Context
-  // is the root Naming Context for the server, i.e., it is un<destroy>able.
+
+  HASH_MAP context_;
+  // This implementation of <NamingContext> uses <ACE_Hash_Map> for
+  // storage and manipulation of name-object bindings.
+
+  int root_;
+  // Flag indicating whether the context is a root or not.  It allows
+  // to do things like have <destroy> be a no-op on root context.
+  // Values: 1 indicates root, 0 indicates not a root.
+
+  ACE_Lock *lock_;
+  // Lock to serialize access to the underlying data structure.  This
+  // is a lock adapter that hides the type of lock, which may be a
+  // null lock if the ORB decides threading is not necessary.
+
+  size_t hash_table_size_;
+  // Hash table size.
+
+  TAO_Naming_Context *interface_;
+  // Pointer to the 'Abstraction' in the bridge pattern.  We need this
+  // pointer so that we can clean up the Abstraction as necessary when <destroy>
+  // method is called.  The reason we need to clean up as opposed to
+  // the Abstraction itself is that we, the concrete implementation,  have the *knowledge* of how
+  // to do this, e.g., we may have one servant serving many objects
+  // and would not want to delete the servant in the <destroy> operation.
+};
+
+class TAO_ORBSVCS_Export TAO_Hash_Binding_Iterator :
+  public POA_CosNaming::BindingIterator
+{
+  // = TITLE
+  //     This class implements the <BindingIterator> interface that is
+  //     part of the <CosNaming> idl module based on the Hash_Map
+  //     implementation for CosNaming::NamingContext.
+  //
+  // = DESCRIPTION
+  //     <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_Hash_Binding_Iterator (TAO_Hash_Naming_Context::HASH_MAP::ITERATOR *hash_iter,
+                             PortableServer::POA_ptr poa,
+                             ACE_Lock *lock);
+  // Constructor.
+
+  ~TAO_Hash_Binding_Iterator (void);
+  // Destructor.
+
+  // Returns the Default POA of this Servant object
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+
+  CORBA::Boolean next_one (CosNaming::Binding_out b,
+                           CORBA::Environment &ACE_TRY_ENV);
+  // 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);
+  // This operation returns at most the requested number of bindings.
+
+  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  // This operation destroys the iterator.
+
+private:
+  TAO_Hash_Naming_Context::HASH_MAP::ITERATOR *hash_iter_;
+  // A pointer to the hash map iterator.
+
+  ACE_Lock *lock_;
+  // Lock passed on from <TAO_NamingContext> to serialize access to the
+  // internal data structure.
+
+  PortableServer::POA_var poa_;
+  // Implement a different _default_POA()
 };
 
 #endif /* TAO_HASH_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
index fc43c2eb9a3..74cb7670bca 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
@@ -14,8 +14,8 @@
 
 #include "Naming_Context.h"
 
-TAO_Naming_Context::TAO_Naming_Context (TAO_Naming_Context_Impl *impl)
-  : impl_ (impl)
+TAO_Naming_Context::TAO_Naming_Context (void)
+  : impl_ (0)
 {
 }
 
@@ -24,6 +24,12 @@ TAO_Naming_Context::~TAO_Naming_Context (void)
   delete impl_;
 }
 
+void
+TAO_Naming_Context::impl (TAO_Naming_Context_Impl *impl)
+{
+  impl_ = impl;
+}
+
 PortableServer::POA_ptr
 TAO_Naming_Context::_default_POA (CORBA::Environment &/*env*/)
 {
@@ -34,11 +40,6 @@ void
 TAO_Naming_Context::bind (const CosNaming::Name &n,
                           CORBA::Object_ptr obj,
                           CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNaming::NamingContext::NotFound,
-                     CosNaming::NamingContext::CannotProceed,
-                     CosNaming::NamingContext::InvalidName,
-                     CosNaming::NamingContext::AlreadyBound))
 {
   impl_->bind (n, obj, ACE_TRY_ENV);
 }
@@ -47,10 +48,6 @@ void
 TAO_Naming_Context::rebind (const CosNaming::Name &n,
                             CORBA::Object_ptr obj,
                             CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   impl_->rebind (n, obj, ACE_TRY_ENV);
 }
@@ -59,11 +56,6 @@ void
 TAO_Naming_Context::bind_context (const CosNaming::Name &n,
                                   CosNaming::NamingContext_ptr nc,
                                   CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName,
-                       CosNaming::NamingContext::AlreadyBound))
 {
   impl_->bind_context (n, nc, ACE_TRY_ENV);
 }
@@ -72,10 +64,6 @@ void
 TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
                                     CosNaming::NamingContext_ptr nc,
                                     CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   impl_->rebind_context (n, nc, ACE_TRY_ENV);
 }
@@ -83,10 +71,6 @@ TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
 CORBA::Object_ptr
 TAO_Naming_Context::resolve (const CosNaming::Name &n,
                              CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   return impl_->resolve (n, ACE_TRY_ENV);
 }
@@ -94,17 +78,12 @@ TAO_Naming_Context::resolve (const CosNaming::Name &n,
 void
 TAO_Naming_Context::unbind (const CosNaming::Name &n,
                             CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   impl_->unbind (n, ACE_TRY_ENV);
 }
 
 CosNaming::NamingContext_ptr
 TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return impl_->new_context (ACE_TRY_ENV);
 }
@@ -112,19 +91,12 @@ TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 CosNaming::NamingContext_ptr
 TAO_Naming_Context::bind_new_context (const CosNaming::Name &n,
                                       CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::AlreadyBound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName))
 {
   return impl_->bind_new_context (n, ACE_TRY_ENV);
 }
 
 void
 TAO_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotEmpty))
 {
   impl_->destroy (ACE_TRY_ENV);
 }
@@ -134,7 +106,6 @@ TAO_Naming_Context::list (CORBA::ULong how_many,
                           CosNaming::BindingList_out bl,
                           CosNaming::BindingIterator_out bi,
                           CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   impl_->list (how_many, bl, bi, ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
index a48ea9b3812..3eeaf616d06 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
@@ -20,23 +20,15 @@
 
 class TAO_Naming_Context_Impl;
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
-class TAO_ORBSVCS_Export TAO_Naming_Context :
-  public virtual PortableServer::RefCountServantBase,
-  public virtual POA_CosNaming::NamingContext
+class TAO_ORBSVCS_Export TAO_Naming_Context : public POA_CosNaming::NamingContext
 {
   // = TITLE
   //   This class plays a role of the 'Abstraction' (aka 'Interface')
-  //   in the Bridge pattern architecture of the
-  //   CosNaming::NamingContext implementation.
+  //   in the Bridge pattern architecture for the Naming Service implementation.
   //
   // = DESCRIPTION
   //   This class simply forwards all client requests to a concrete
-  //   NamingContext implementation through its <impl_> pointer.  See
+  //   Naming Service implementation through its <impl_> pointer.  See
   //   README file for more info.  Comments for the idl methods
   //   describe methods semantics - actual actions are carried out by
   //   concrete implementors.
@@ -44,24 +36,20 @@ class TAO_ORBSVCS_Export TAO_Naming_Context :
 public:
 
   // = Initialization and termination methods.
-  TAO_Naming_Context (TAO_Naming_Context_Impl *impl);
-  // Constructor.  Initializes <impl_> with a concrete implementation.
+  TAO_Naming_Context (void);
+  // Constructor.
 
   ~TAO_Naming_Context (void);
-  // Destructor.
+  // destructor.
+
+  void impl (TAO_Naming_Context_Impl *impl);
+  // Initialize <impl_> with a concrete implementation.
 
   // = CosNaming::NamingContext idl interface methods.
 
   virtual void bind (const CosNaming::Name &n,
                      CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosNaming::NamingContext::NotFound,
-                     CosNaming::NamingContext::CannotProceed,
-                     CosNaming::NamingContext::InvalidName,
-                     CosNaming::NamingContext::AlreadyBound));
-
+                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Create a binding for name <n> and object <obj> in the naming
   // context.  Compound names are treated as follows: ctx->bind (<c1;
   // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
@@ -72,13 +60,7 @@ public:
 
   virtual void rebind (const CosNaming::Name &n,
                        CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
-
+                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This is similar to <bind> operation above, except for when the
   // binding for the specified name already exists in the specified
   // context.  In that case, the existing binding is replaced with the
@@ -86,37 +68,20 @@ public:
 
   virtual void bind_context (const CosNaming::Name &n,
                              CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName,
-                       CosNaming::NamingContext::AlreadyBound));
-
+                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This is the version of <bind> specifically for binding naming
   // contexts, so that they will participate in name resolution when
   // compound names are passed to be resolved.
 
   virtual void rebind_context (const CosNaming::Name &n,
                                CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
+                               CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This is a version of <rebind> specifically for naming contexts,
   // so that they can participate in name resolution when compound
   // names are passed.
 
   virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
+                                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Return object reference that is bound to the name.  Compound name
   // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
   // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
@@ -124,60 +89,34 @@ public:
   // for "narrowing" the object to the appropriate type.
 
   virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
-
+                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Remove the name binding from the context.  When compound names
   // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
-  virtual CosNaming::NamingContext_ptr new_context (
-      CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
+  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV =
+                                                    TAO_default_environment ());
   // This operation returns a new naming context implemented by the
   // same naming server in which the operation was invoked.  The
   // context is not bound.
 
-  virtual CosNaming::NamingContext_ptr bind_new_context (
-      const CosNaming::Name &n,
-      CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotFound,
-                       CosNaming::NamingContext::AlreadyBound,
-                       CosNaming::NamingContext::CannotProceed,
-                       CosNaming::NamingContext::InvalidName));
-
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
+                                                         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This operation creates a new context and binds it to the name
   // supplied as an argument.  The newly-created context is
   // implemented by the same server as the context in which it was
   // bound (the name argument excluding the last component).
 
-
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       CosNaming::NamingContext::NotEmpty));
-  // Delete the naming context.  The user should take care to <unbind> any
-  // bindings in which the given context is bound to some names, to
-  // avoid dangling references when invoking <destroy> operation.
-  // NOTE: <destory> is a no-op on the root context.
-  // NOTE: after <destroy> is invoked on a Naming Context, all
-  // BindingIterators associated with that Naming Context are also destroyed.
+  virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  // Delete the naming context.  NOTE: the user should <unbind> any
+  // bindings in which the given context is bound to some names before
+  // invoking <destroy> operation on it.
+  // NOTE: this operation is a no-op on the root context.
 
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out bl,
                      CosNaming::BindingIterator_out bi,
-                     CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
+                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
   // Returns at most the requested number of bindings <how_many> in
   // <bl>.  If the naming context contains additional bindings, they
   // are returned with a BindingIterator.  In the naming context does
@@ -196,10 +135,10 @@ class TAO_ORBSVCS_Export TAO_Naming_Context_Impl
 {
   // = TITLE
   //   This abstract base class plays a role of the 'Implementor' in the Bridge
-  //   pattern architecture of the NamingContext implementation.
+  //   pattern architecture for the implementation of the Naming Service.
   //
   // = DESCRIPTION
-  //   Subclasses of TAO_Naming_Context_Impl provide concrete
+  //   Subclasses of TAO_NamingContext_Impl provide concrete
   //   implementations of the NamingContext functionality.
 
 public:
@@ -267,12 +206,10 @@ public:
   // bound (the name argument excluding the last component).
 
   virtual void destroy (CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Delete the naming context.  The user should take care to <unbind> any
-  // bindings in which the given context is bound to some names, to
-  // avoid dangling references when invoking <destroy> operation.
-  // NOTE: <destory> is a no-op on the root context.
-  // NOTE: after <destroy> is invoked on a Naming Context, all
-  // BindingIterators associated with that Naming Context are also destroyed.
+  // Delete the naming context.  NOTE: the user should <unbind> any
+  // bindings in which the given context is bound to some names before
+  // invoking <destroy> operation on it.
+  // NOTE: this operation is a no-op on the root context.
 
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index 3d8d2261c6f..9349e2cd726 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -4,8 +4,8 @@
 #include "tao/corba.h"
 #include "Naming_Utils.h"
 #include "ace/Arg_Shifter.h"
-#include "Transient_Naming_Context.h"
-#include "Persistent_Context_Index.h"
+#include "Hash_Naming_Context.h"
+#include "Persistent_Context_Index_T.h"
 #include "ace/Auto_Ptr.h"
 
 ACE_RCSID(Naming, Naming_Utils, "$Id$")
@@ -124,12 +124,18 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
     {
       if (persistence_location != 0)
         {
-          // This needs to be cleaned up (currently a memory leak) when
+          // 1.  Please do not change to ACE_NEW_RETURN, 2.  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);
+          TAO_Persistent_Context_Index<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> *context_index =
+            new TAO_Persistent_Context_Index<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> (orb,
+                                                                                     poa);
+
+          if (context_index == 0)
+            {
+              errno = ENOMEM;
+              return -1;
+            }
 
           if (context_index->open (persistence_location) == -1)
             ACE_DEBUG ((LM_DEBUG,
@@ -159,41 +165,37 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
         }
       else
         {
-          TAO_Transient_Naming_Context *context_impl = 0;
-          ACE_NEW_RETURN (context_impl,
-                          TAO_Transient_Naming_Context (poa,
-                                                        "NameService",
-                                                        context_size),
-                          -1);
+          TAO_Naming_Context *c = 0;
+          TAO_Hash_Naming_Context *c_impl = 0;
 
-          // Put <context_impl> into the auto pointer temporarily, in case
-          // next allocation fails.
-          ACE_Auto_Basic_Ptr<TAO_Transient_Naming_Context> temp (context_impl);
+          // To keep compilers warnings away.
+          ACE_UNUSED_ARG (c_impl);
 
-          TAO_Naming_Context *context = 0;
-          ACE_NEW_RETURN (context,
-                          TAO_Naming_Context (context_impl),
+          ACE_NEW_RETURN (c,
+                          TAO_Naming_Context,
                           -1);
 
-          // Change what we hold in auto pointer.
-          temp.release ();
-          ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp2 (context);
-
-          // Register with the POA.
+          // Put <c> into the auto pointer temporarily, in case
+          // next allocation fails.
+          ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
+
+          ACE_NEW_RETURN (c_impl,
+                          TAO_Hash_Naming_Context (c,
+                                                   poa,
+                                                   "NameService",
+                                                   context_size,
+                                                   1),
+                          -1);
           PortableServer::ObjectId_var id =
-            PortableServer::string_to_ObjectId ("NameService");
+           PortableServer::string_to_ObjectId ("NameService");
 
           poa->activate_object_with_id (id.in (),
-                                        context,
+                                        c,
                                         ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           this->naming_context_ =
-            context->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // Give POA the ownership of this servant.
-          context->_remove_ref (ACE_TRY_ENV);
+            c->_this (ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           // To make NS locatable through iioploc.  Right now not
@@ -215,8 +217,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                         this->naming_service_ior_.in ()));
 
           // everything succeeded, so set the pointer, get rid of Auto_Ptr.
-          this->naming_context_impl_ = context;
-          temp2.release ();
+          this->naming_context_impl_ = temp.release ();
         }
 #if defined (ACE_HAS_IP_MULTICAST)
       // Get reactor instance from TAO.
@@ -365,3 +366,15 @@ TAO_Naming_Client::~TAO_Naming_Client (void)
 {
   // Do nothing
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class ACE_Auto_Basic_Ptr<TAO_Naming_Context>;
+  template class TAO_Persistent_Context_Index<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>;
+  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> >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Naming_Context>
+  #pragma instantiate TAO_Persistent_Context_Index<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>
+  #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> >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.cpp
new file mode 100644
index 00000000000..e83a1a64ff5
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.cpp
@@ -0,0 +1,244 @@
+// $Id$
+// ============================================================================
+//
+// = LIBRARY
+//    cos
+//
+// = FILENAME
+//   Persistent_Bindings_Map.cpp
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu>
+//
+// ============================================================================
+
+#include "Persistent_Bindings_Map.h"
+
+
+int
+TAO_Persistent_Bindings_Map::unbind (const char *id,
+                                     const char *kind)
+{
+  TAO_Persistent_ExtId name (id, kind);
+  TAO_Persistent_IntId entry;
+  if (this->map_->unbind (name, entry, this->allocator_) != 0)
+    return -1;
+  else
+    {
+      // Free up the memory we allocated in shared_bind().  Note that
+      // this assumes that the "ref" pointer comes first and that
+      // the ref, id and kind are contiguously allocated (see
+      // shared_bind() for details)
+      this->allocator_->free ((void *) (entry.ref_));
+      return 0;
+    }
+}
+
+int
+TAO_Persistent_Bindings_Map::bind (const char *id,
+                                   const char *kind,
+                                   CORBA::Object_ptr obj,
+                                   CosNaming::BindingType type)
+{
+  return this->shared_bind (id, kind, obj, type, 0);
+}
+
+int
+TAO_Persistent_Bindings_Map::rebind (const char *id,
+                                     const char *kind,
+                                     CORBA::Object_ptr obj,
+                                     CosNaming::BindingType type)
+{
+  return this->shared_bind (id, kind, obj, type, 1);
+}
+
+int
+TAO_Persistent_Bindings_Map::find (const char *id,
+                                   const char *kind,
+                                   CORBA::Object_ptr & obj,
+                                   CosNaming::BindingType &type)
+{
+  TAO_Persistent_ExtId name (id, kind);
+  TAO_Persistent_IntId entry;
+
+  if (this->map_->find (name,
+                        entry,
+                        this->allocator_) != 0)
+    return -1;
+  else
+    {
+      ACE_DECLARE_NEW_CORBA_ENV;
+      obj = orb_->string_to_object (entry.ref_, ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
+      type = entry.type ();
+
+      return 0;
+    }
+}
+
+TAO_Persistent_Bindings_Map::TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb)
+  : allocator_ (0),
+    map_ (0),
+    orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map (void)
+{
+}
+
+void
+TAO_Persistent_Bindings_Map::destroy (void)
+{
+  allocator_->free (map_);
+}
+
+TAO_Persistent_Bindings_Map::HASH_MAP *
+TAO_Persistent_Bindings_Map::map (void)
+{
+  return map_;
+}
+
+size_t
+TAO_Persistent_Bindings_Map::total_size (void)
+{
+  return map_->total_size ();
+}
+
+size_t
+TAO_Persistent_Bindings_Map::current_size (void)
+{
+  return map_->current_size ();
+}
+
+int
+TAO_Persistent_Bindings_Map::open (size_t size,
+                                   ACE_Allocator *alloc)
+{
+  allocator_ = alloc;
+
+  void *ns_map = 0;
+
+  size_t map_size = sizeof (HASH_MAP);
+  ns_map = this->allocator_->malloc (map_size);
+
+  // Initialize the map into its memory location (e.g., shared memory).
+  ACE_NEW_RETURN (this->map_,
+                  (ns_map) HASH_MAP (size, this->allocator_),
+                  -1);
+
+  return 0;
+}
+
+void
+TAO_Persistent_Bindings_Map::set (HASH_MAP *map,
+                                  ACE_Allocator *alloc)
+{
+  allocator_ = alloc;
+  map_ = map;
+}
+
+int
+TAO_Persistent_Bindings_Map::shared_bind (const char * id,
+                                          const char * kind,
+                                          CORBA::Object_ptr obj,
+                                          CosNaming::BindingType type,
+                                          int rebind)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::String_var ref = orb_->object_to_string (obj, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  size_t id_len = ACE_OS::strlen (id) + 1;
+  size_t kind_len = ACE_OS::strlen (kind) + 1;
+  size_t ref_len = ACE_OS::strlen (ref) + 1;
+  size_t total_len = id_len + kind_len + ref_len;
+  char *ptr = (char *) this->allocator_->malloc (total_len);
+
+  if (ptr == 0)
+    return -1;
+  else
+    {
+      // Note that the <ref> *must* come first to make sure we can
+      // retrieve this pointer later on in unbind().
+      char * ref_ptr = ptr;
+      char * id_ptr =  ptr + ref_len;
+      char * kind_ptr = ptr + ref_len + id_len;
+      ACE_OS::strcpy (ref_ptr, ref.in ());
+      ACE_OS::strcpy (id_ptr, id);
+      ACE_OS::strcpy (kind_ptr, kind);
+
+      TAO_Persistent_ExtId new_name (id_ptr, kind_ptr);
+      TAO_Persistent_IntId new_entry (ref_ptr, type);
+      int result = -1;
+
+      if (rebind == 0)
+        {
+          // Do a normal bind.  This will fail if there's already an
+          // <new_internal> with the same name.
+          result = this->map_->bind (new_name, new_entry, this->allocator_);
+
+          if (result == 1)
+            {
+              // Entry already existed so bind failed. Free our dynamically allocated memory.
+              this->allocator_->free ((void *) ptr);
+              return result;
+            }
+        }
+      else
+        {
+          // 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;
+
+          result = this->map_->rebind (new_name, new_entry,
+                                       old_name, old_entry,
+                                       this->allocator_);
+          if (result == 1)
+            {
+              // Free up the memory we allocated in shared_bind().  Note that this
+              // assumes that the "value" pointer comes first and that the value,
+              // name, and type are contiguously allocated (see above for details)
+              this->allocator_->free ((void *) old_entry.ref_);
+            }
+        }
+
+      if (result == -1)
+        // Free our dynamically allocated memory.
+        this->allocator_->free ((void *) ptr);
+      else
+        // 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);
+
+      return result;
+    }
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+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>;
+template class ACE_Hash<TAO_Persistent_ExtId>;
+template class ACE_Equal_To<TAO_Persistent_ExtId>;
+template class ACE_Hash_Map_Iterator_Base_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_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>;
+template class 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 ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#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>
+#pragma instantiate ACE_Hash<TAO_Persistent_ExtId>
+#pragma instantiate ACE_Equal_To<TAO_Persistent_ExtId>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_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_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>
+#pragma instantiate 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>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h
new file mode 100644
index 00000000000..0ef047598ff
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h
@@ -0,0 +1,103 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    cos
+//
+// = FILENAME
+//    Persistent_Bindings_Map.h
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef TAO_PERSISTENT_BINDINGS_MAP_H
+#define TAO_PERSISTENT_BINDINGS_MAP_H
+
+#include "Persistent_Entries.h"
+
+class TAO_ORBSVCS_Export TAO_Persistent_Bindings_Map
+{
+  // = TITLE
+  //
+  //
+  // = DESCRIPTION
+  //
+public:
+  typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId> HASH_MAP;
+
+  // = Initialization and termination methods.
+  TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb);
+  // "Do-nothing" constructor.
+
+  int open (size_t size,
+            ACE_Allocator *alloc);
+  // Allocate hash map using the <alloc>.
+
+  void set (HASH_MAP *map,
+           ACE_Allocator *alloc);
+  // The map is already preallocated for us.
+
+  ~TAO_Persistent_Bindings_Map (void);
+  // destructor, do some cleanup :TBD: last dtor should "compress"
+  // file
+
+  void destroy (void);
+  // This method removes frees up the hash map from allocator.
+  // It better be empty, since we are not cleaning up the insides. (We
+  // could add <close> to clean entries, but not the data inside.
+
+  size_t total_size (void);
+  size_t current_size (void);
+  // return the size of the underlying hash map.
+
+  int bind (const char *id,
+            const char *kind,
+            CORBA::Object_ptr obj,
+            CosNaming::BindingType type);
+  // Bind a new name to a naming context
+
+  int rebind (const char *id,
+              const char *kind,
+              CORBA::Object_ptr obj,
+              CosNaming::BindingType type);
+  // Overwrite the value or type of an existing name in a
+  // ACE_Local_Name_Space or bind a new name to the context, if it
+  // didn't exist yet. (Wide charcter strings interface).
+
+  int unbind (const char * id,
+              const char * kind);
+
+  int find (const char * id,
+            const char * kind,
+            CORBA::Object_ptr & obj,
+            CosNaming::BindingType &type);
+
+  //A method to get the iterator.
+
+  HASH_MAP *map (void);
+  // accessor
+
+private:
+
+  int shared_bind (const char *id,
+                   const char *kind,
+                   CORBA::Object_ptr obj,
+                   CosNaming::BindingType type,
+                   int rebind);
+  // Factor out code from <bind> and <rebind>.
+
+  ACE_Allocator *allocator_;
+  // Pointer to the allocator
+
+  HASH_MAP *map_;
+  // Pointer to the allocated map manager.
+
+  CORBA::ORB_var orb_;
+  // a pointer to the orb so that we can do string/object conversions.
+};
+
+#endif /* TAO_PERSISTENT_BINDINGS_MAP */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index be002e620a2..f34f53fc34d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -1,347 +1,13 @@
 // $Id$
 
 #include "Persistent_Context_Index.h"
-#include "Persistent_Naming_Context.h"
-#include "ace/Auto_Ptr.h"
 
-int
-TAO_Persistent_Context_Index::unbind (const char *poa_id)
+TAO_Index::~TAO_Index (void)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
-
-  TAO_Persistent_Index_ExtId name (poa_id);
-  TAO_Persistent_Index_IntId entry;
-  if (this->index_->unbind (name, entry, this->allocator_) != 0)
-    return -1;
-  else
-    {
-      // Free up the memory we allocated in bind().
-      this->allocator_->free ((void *) (entry.counter_));
-      return 0;
-    }
-}
-
-int
-TAO_Persistent_Context_Index::bind (const char *poa_id,
-                                    ACE_UINT32 *&counter,
-                                    TAO_Persistent_Context_Index::CONTEXT *hash_map)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
-
-  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);
-
-  if (ptr == 0)
-    return -1;
-  else
-    {
-      counter = ACE_reinterpret_cast (ACE_UINT32 *, ptr);
-      *counter = 0;
-      char * poa_id_ptr = ptr + counter_len;
-      ACE_OS::strcpy (poa_id_ptr, poa_id);
-
-      TAO_Persistent_Index_ExtId name (poa_id_ptr);
-      TAO_Persistent_Index_IntId entry (counter, hash_map);
-      int result = -1;
-
-      // Do a normal bind.  This will fail if there's already an
-      // entry with the same name.
-      result = this->index_->bind (name, entry, this->allocator_);
-
-      if (result == 1)
-        {
-          // Entry already existed so bind failed. Free our dynamically allocated memory.
-          this->allocator_->free ((void *) ptr);
-          return result;
-        }
-
-      if (result == -1)
-        // Free our dynamically allocated memory.
-        this->allocator_->free ((void *) ptr);
-      else
-        // If bind() succeed, it will automatically sync
-        // up the map manager entry.  However, we must sync up our
-        // name/value memory.
-        this->allocator_->sync (ptr, poa_id_len + counter_len);
-
-      return result;
-    }
 }
 
-TAO_Persistent_Context_Index::TAO_Persistent_Context_Index
-  (CORBA::ORB_ptr orb,
-   PortableServer::POA_ptr poa)
-  : allocator_ (0),
-    index_ (0),
-    index_file_ (0),
-    base_address_ (0),
-    orb_ (CORBA::ORB::_duplicate (orb)),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Persistent_Context_Index::~TAO_Persistent_Context_Index (void)
-{
-  delete allocator_;
-  ACE_OS::free (ACE_reinterpret_cast (void*, ACE_const_cast (LPTSTR, index_file_)));
-}
-
-ACE_Allocator*
-TAO_Persistent_Context_Index::allocator (void)
-{
-  return allocator_;
-}
-
-char*
-TAO_Persistent_Context_Index::root_ior (void)
-{
-  return CORBA::string_dup (root_ior_.in ());
-}
-
-CORBA::ORB_ptr
-TAO_Persistent_Context_Index::orb (void)
-{
-  return orb_.in ();
-}
-
-int
-TAO_Persistent_Context_Index::open (LPCTSTR file_name,
-                                    void *base_address)
-{
-  this->base_address_ = base_address;
-
-  index_file_ = ACE_OS::strdup (file_name);
-  if (index_file_ == 0)
-    return -1;
-
-  return create_index ();
-}
-
-int
-TAO_Persistent_Context_Index::init (void)
-{
-  // Return value of this function (necessary to keep compilers quiet).
-  int status = 0;
-
-  if (index_->current_size () == 0)
-    // 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");
-
-      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;
-    }
-
-  else
-    // CASE 2:Recreate all Naming Contexts.
-    status = recreate_all ();
-
-  return status;
-}
-
-int
-TAO_Persistent_Context_Index::recreate_all (void)
-{
-  INDEX::ITERATOR *index_iter = 0;
-
-  ACE_NEW_RETURN (index_iter,
-                  (INDEX::ITERATOR) (*index_),
-                  -1);
-
-  ACE_Auto_Basic_Ptr<INDEX::ITERATOR> it (index_iter);
-
-  // Because of broken old g++!!!
-  typedef ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
-    TAO_Persistent_Index_IntId>  IND_DEF;
-
-  IND_DEF::ENTRY *entry = 0;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file... \n"));
-
-  do
-    {
-      index_iter->next (entry);
-
-      // 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 (),
-                                                     entry->ext_id_.poa_id_,
-                                                     this,
-                                                     entry->int_id_.hash_map_,
-                                                     entry->int_id_.counter_),
-                  -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);
-
-      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 (entry->ext_id_.poa_id_);
-
-      this->poa_->activate_object_with_id (id.in (),
-                                           context,
-                                           ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-
-      CosNaming::NamingContext_var result = context->_this (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-
-      // 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;
-}
-
-int
-TAO_Persistent_Context_Index::create_index (void)
-{
-  if (ACE_OS::strlen (index_file_) >= MAXNAMELEN + MAXPATHLEN)
-    {
-      errno = ENAMETOOLONG;
-      return -1;
-    }
-
-#if !defined (CHORUS)
-  ACE_MMAP_Memory_Pool::OPTIONS options (base_address_);
-#else
-  // Use base address == 0, don't use a fixed address.
-  ACE_MMAP_Memory_Pool::OPTIONS options (0,
-                                         0,
-                                         0,
-                                         ACE_CHORUS_LOCAL_NAME_SPACE_T_SIZE);
-#endif /* CHORUS */
-
-  // Create the allocator with the appropriate options.  The name used
-  // for  the lock is the same one as used for the file.
-  ACE_NEW_RETURN (this->allocator_,
-                  ALLOCATOR (this->index_file_,
-                             this->index_file_,
-                             &options),
-                  -1);
-
-#if !defined (ACE_LACKS_ACCESS)
-  // Now check if the backing store has been created successfully
-  if (ACE_OS::access (this->index_file_, F_OK) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "create_index\n"),
-                      -1);
-#endif /* ACE_LACKS_ACCESS */
-
-  void *context_index = 0;
-
-  // 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_ = (INDEX *) context_index;
-
-  else
-    {
-      size_t index_size = sizeof (INDEX);
-      context_index = this->allocator_->malloc (index_size);
-
-      // 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;
-}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-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_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>;
@@ -353,11 +19,7 @@ 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_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_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>
@@ -368,6 +30,5 @@ template class ACE_Auto_Basic_Ptr<ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId
 #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_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 7ad5d9746d6..ce28c847968 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
@@ -17,91 +17,39 @@
 #ifndef TAO_PERSISTENT_CONTEXT_INDEX_H
 #define TAO_PERSISTENT_CONTEXT_INDEX_H
 
+
+#define TAO_NAME_CONTEXTS_INDEX "Naming_Service_Index"
+
 #include "Persistent_Entries.h"
 
-class TAO_ORBSVCS_Export TAO_Persistent_Context_Index
+class TAO_ORBSVCS_Export TAO_Index
 {
   // = TITLE
-  //
-  //
-  // = DESCRIPTION
-  //
-public:
-
-  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;
+  //   Base class.  For now it is here to avoid templatizing
+  //   TAO_Persistent_Naming_Context.
 
-  // = Initialization and termination methods.
-  TAO_Persistent_Context_Index (CORBA::ORB_ptr orb,
-                                PortableServer::POA_ptr poa);
-  // "Do-nothing" constructor.
-
-  int open (LPCTSTR file_name,
-            void * base_address = ACE_DEFAULT_BASE_ADDR);
-  //
+public:
 
-  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.
+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;
 
-  ~TAO_Persistent_Context_Index (void);
-  // destructor, do some cleanup :TBD: last dtor should "compress"
-  // file
+  virtual ~TAO_Index (void);
+  // Destructor.
 
-  int bind (const char *poa_id,
-                    ACE_UINT32 *&counter,
-                    CONTEXT *hash_map);
+  virtual int bind (const char *poa_id,
+                    ACE_UINT32* & counter,
+                    CONTEXT *hash_map) = 0;
   // Create an entry - new context is created.
 
-  int unbind (const char * poa_id);
+  virtual int unbind (const char * poa_id) = 0;
   // Unbind an entry - a context is destroyed.
 
-  ACE_Allocator *allocator (void);
+  virtual ACE_Allocator *allocator (void) = 0;
   // accessor.
 
-  CORBA::ORB_ptr orb (void);
-  //
-
-  char * root_ior (void);
-  //
-
-  //@@ 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);
-  //
-
-  int create_index (void);
-  // 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
-  // hash map simultanneously.
-
-  ALLOCATOR *allocator_;
-  // Pointer to the allocator
-
-  INDEX *index_;
-  // Pointer to the allocated map manager.
-
-  LPCTSTR index_file_;
-  // Name of the file used for storage.
-
-  void *base_address_;
-
-  CORBA::ORB_var orb_;
-  //
-
-  PortableServer::POA_var poa_;
-  //
-
-  CORBA::String_var root_ior_;
+  virtual CORBA::ORB_ptr orb (void) = 0;
   //
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
new file mode 100644
index 00000000000..846f5a191ef
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
@@ -0,0 +1,355 @@
+// $Id$
+
+#ifndef TAO_PERSISTENT_CONTEXT_INDEX_T_CPP
+#define TAO_PERSISTENT_CONTEXT_INDEX_T_CPP
+
+#include "Persistent_Context_Index_T.h"
+#include "Persistent_Naming_Context.h"
+#include "ace/Auto_Ptr.h"
+
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::unbind (const char *poa_id)
+{
+  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
+
+  TAO_Persistent_Index_ExtId name (poa_id);
+  TAO_Persistent_Index_IntId entry;
+  if (this->index_->unbind (name, entry, this->allocator_) != 0)
+    return -1;
+  else
+    {
+      // Free up the memory we allocated in bind().
+      this->allocator_->free ((void *) (entry.counter_));
+      return 0;
+    }
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::bind (const char *poa_id,
+                                                              ACE_UINT32 *&counter,
+                                                              TAO_Index::CONTEXT *hash_map)
+{
+  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
+
+  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);
+
+  if (ptr == 0)
+    return -1;
+  else
+    {
+      counter = ACE_reinterpret_cast (ACE_UINT32 *, ptr);
+      *counter = 0;
+      char * poa_id_ptr = ptr + counter_len;
+      ACE_OS::strcpy (poa_id_ptr, poa_id);
+
+      TAO_Persistent_Index_ExtId name (poa_id_ptr);
+      TAO_Persistent_Index_IntId entry (counter, hash_map);
+      int result = -1;
+
+      // Do a normal bind.  This will fail if there's already an
+      // entry with the same name.
+      result = this->index_->bind (name, entry, this->allocator_);
+
+      if (result == 1)
+        {
+          // Entry already existed so bind failed. Free our dynamically allocated memory.
+          this->allocator_->free ((void *) ptr);
+          return result;
+        }
+
+      if (result == -1)
+        // Free our dynamically allocated memory.
+        this->allocator_->free ((void *) ptr);
+      else
+        // If bind() succeed, it will automatically sync
+        // up the map manager entry.  However, we must sync up our
+        // name/value memory.
+        this->allocator_->sync (ptr, poa_id_len + counter_len);
+
+      return result;
+    }
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK>
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::TAO_Persistent_Context_Index
+  (CORBA::ORB_ptr orb,
+   PortableServer::POA_ptr poa)
+  : lock_ (0),
+    allocator_ (0),
+    index_ (0),
+    index_file_ (0),
+    base_address_ (0),
+    orb_ (CORBA::ORB::_duplicate (orb)),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK>
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::~TAO_Persistent_Context_Index (void)
+{
+  delete lock_;
+  delete allocator_;
+  ACE_OS::free (ACE_reinterpret_cast (void*, ACE_const_cast (LPTSTR, index_file_)));
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_Allocator*
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::allocator (void)
+{
+  return allocator_;
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK> char*
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::root_ior (void)
+{
+  return CORBA::string_dup (root_ior_.in ());
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK> CORBA::ORB_ptr
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::orb (void)
+{
+  return orb_.in ();
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::open (LPCTSTR file_name,
+                                                              void *base_address)
+{
+  this->base_address_ = base_address;
+
+  index_file_ = ACE_OS::strdup (file_name);
+  if (index_file_ == 0)
+    return -1;
+
+  return create_index ();
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::init (void)
+{
+  // Return value of this function (necessary to keep compilers quiet).
+  int status = 0;
+
+  if (index_->current_size () == 0)
+    // CASE 1:there are no Naming Contexts registered.  We need to create
+    // one.
+    {
+      TAO_Persistent_Naming_Context *c_impl = 0;
+      TAO_Naming_Context *c = 0;
+      CosNaming::NamingContext_var result;
+
+      ACE_NEW_RETURN (c,
+                      TAO_Naming_Context,
+                      -1);
+
+      // Put c into the auto pointer temporarily, in case next
+      // allocation fails.
+      ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
+
+      ACE_NEW_RETURN (c_impl,
+                      TAO_Persistent_Naming_Context (c,
+                                                     this,
+                                                     poa_.in (),
+                                                     "NameService"),
+                      -1);
+
+      if (c_impl->init () == -1)
+        {
+          delete c_impl;
+          return -1;
+        }
+      // Allocation succeeded, get rid of auto pointer.
+      temp.release ();
+
+      ACE_DECLARE_NEW_CORBA_ENV;
+      ACE_TRY
+        {
+          PortableServer::ObjectId_var id =
+            PortableServer::string_to_ObjectId ("NameService");
+
+          this->poa_->activate_object_with_id (id.in (),
+                                               c,
+                                               ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          result = c->_this (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          this->root_ior_=
+            orb_->object_to_string (result.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          // register with the index @@need to roll back in case this fails.
+          this->bind ("NameService",
+                      c_impl->counter_,
+                      c_impl->context_.map ());
+
+          // Everything went successfully.
+          status = 0;
+            }
+      ACE_CATCHANY
+        {
+          delete c;
+          return -1;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (-1);
+    }
+
+  else
+    // CASE 2:Recreate all Naming Contexts.
+    status = recreate_all ();
+
+  return status;
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::recreate_all (void)
+{
+  // We can't use our INDEX typedef here because of the broken old g++!
+
+  ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
+    TAO_Persistent_Index_IntId>::ITERATOR * index_iter = 0;
+
+  ACE_NEW_RETURN (index_iter,
+                  (ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>::ITERATOR) (*index_),
+                  -1);
+
+  ACE_Auto_Basic_Ptr<ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
+    TAO_Persistent_Index_IntId>::ITERATOR> it (index_iter);
+
+  ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
+    TAO_Persistent_Index_IntId>::ENTRY *entry = 0;
+
+   if (TAO_debug_level > 0)
+     ACE_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file... \n"));
+
+  do
+    {
+      index_iter->next (entry);
+
+      TAO_Persistent_Naming_Context *c_impl = 0;
+      TAO_Naming_Context *c = 0;
+      CosNaming::NamingContext_var result;
+
+      ACE_NEW_RETURN (c,
+                      TAO_Naming_Context,
+                      -1);
+
+      // Put c into the auto pointer temporarily, in case next
+      // allocation fails.
+      ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
+
+      ACE_NEW_RETURN (c_impl,
+                      TAO_Persistent_Naming_Context (c,
+                                                     this,
+                                                     poa_.in (),
+                                                     entry->ext_id_.poa_id_,
+                                                     entry->int_id_.hash_map_,
+                                                     entry->int_id_.counter_),
+                  -1);
+
+      // Allocation succeeded, get rid of auto pointer.
+      temp.release ();
+
+      ACE_DECLARE_NEW_CORBA_ENV;
+      ACE_TRY
+        {
+          PortableServer::ObjectId_var id =
+            PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_);
+
+          this->poa_->activate_object_with_id (id.in (),
+                                               c,
+                                               ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          result = c->_this (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          if (ACE_OS::strcmp ("NameService", entry->ext_id_.poa_id_) == 0)
+            this->root_ior_=
+              orb_->object_to_string (result.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          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_,
+                        (*(c_impl->counter_))));
+        }
+      ACE_CATCHANY
+        {
+          delete c;
+          return -1;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (-1);
+
+    } while (index_iter->advance ());
+
+  return 0;
+}
+
+template <ACE_MEM_POOL_1, class ACE_LOCK> int
+TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::create_index (void)
+{
+  if (ACE_OS::strlen (index_file_) >= MAXNAMELEN + MAXPATHLEN)
+    {
+      errno = ENAMETOOLONG;
+      return -1;
+    }
+
+#if !defined (CHORUS)
+  ACE_MEM_POOL_OPTIONS options (base_address_);
+#else
+  // Use base address == 0, don't use a fixed address.
+  ACE_MEM_POOL_OPTIONS options (0,
+                                0,
+                                0,
+                                ACE_CHORUS_LOCAL_NAME_SPACE_T_SIZE);
+#endif /* CHORUS */
+
+  // Create the allocator with the appropriate options.  The name used
+  // for  the lock is the same one as used for the file.
+  ACE_NEW_RETURN (this->allocator_,
+                  ALLOCATOR (this->index_file_,
+                             this->index_file_,
+                             &options),
+                  -1);
+
+  ACE_NEW_RETURN (this->lock_, ACE_LOCK, -1);
+
+#if !defined (ACE_LACKS_ACCESS)
+  // Now check if the backing store has been created successfully
+  if (ACE_OS::access (this->index_file_, F_OK) != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "create_index\n"),
+                      -1);
+#endif /* ACE_LACKS_ACCESS */
+
+  void *context_index = 0;
+
+  // This is the easy case since if we find the Context Index Map
+  // we know it's already initialized.
+  if (this->allocator_->find (TAO_NAME_CONTEXTS_INDEX, context_index) == 0)
+    this->index_ = (INDEX *) context_index;
+
+  else
+    {
+      size_t index_size = sizeof (INDEX);
+      context_index = this->allocator_->malloc (index_size);
+
+      // 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_NAME_CONTEXTS_INDEX, context_index) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "create_index\n"), -1);
+    }
+
+  return 0;
+}
+
+#endif /* TAO_PERSISTENT_CONTEXT_INDEX_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.h
new file mode 100644
index 00000000000..b3df8a6bbae
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.h
@@ -0,0 +1,112 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    cos
+//
+// = FILENAME
+//    Persistent_Context_Index_T.h
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef TAO_PERSISTENT_CONTEXT_INDEX_T_H
+#define TAO_PERSISTENT_CONTEXT_INDEX_T_H
+
+#include "Persistent_Context_Index.h"
+
+template <ACE_MEM_POOL_1, class ACE_LOCK>
+class TAO_Persistent_Context_Index : public TAO_Index
+{
+  // = TITLE
+  //
+  //
+  // = DESCRIPTION
+  //   ACE_LOCK should either be ACE_Null_Mutex or ACE_Thread_Mutex.
+  //   ACE_MEM_POOL_1 for now is ACE_MMAP_Memory_Pool, later may make
+  //   sense with other pools.
+public:
+  // = Initialization and termination methods.
+  TAO_Persistent_Context_Index (CORBA::ORB_ptr orb,
+                                PortableServer::POA_ptr poa);
+  // "Do-nothing" constructor.
+
+  int open (LPCTSTR file_name,
+            void * base_address = ACE_DEFAULT_BASE_ADDR);
+  //
+
+  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.
+
+  ~TAO_Persistent_Context_Index (void);
+  // destructor, do some cleanup :TBD: last dtor should "compress"
+  // file
+
+  virtual int bind (const char *poa_id,
+                    ACE_UINT32 *&counter,
+                    CONTEXT *hash_map);
+  // Create an entry - new context is created.
+
+  virtual int unbind (const char * poa_id);
+  // Unbind an entry - a context is destroyed.
+
+  virtual ACE_Allocator *allocator (void);
+  // accessor.
+
+  virtual CORBA::ORB_ptr orb (void);
+  //
+
+  char * root_ior (void);
+  //
+
+  typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MEM_POOL_2, ACE_LOCK>
+  > ALLOCATOR;
+
+private:
+
+  int recreate_all (void);
+  //
+
+  int create_index (void);
+  // Allocate the appropriate type of map manager that stores the
+  // key/value binding.
+
+  ACE_LOCK *lock_;
+  // Lock to prevent multiple threads from modifying entries in the
+  // hash map simultanneously.
+
+  ALLOCATOR *allocator_;
+  // Pointer to the allocator
+
+  INDEX *index_;
+  // Pointer to the allocated map manager.
+
+  LPCTSTR index_file_;
+  // Name of the file used for storage.
+
+  void *base_address_;
+
+  CORBA::ORB_var orb_;
+  //
+
+  PortableServer::POA_var poa_;
+  //
+
+  CORBA::String_var root_ior_;
+  //
+};
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Persistent_Context_Index_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Persistent_Context_Index_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#endif /* TAO_PERSISTENT_CONTEXT_INDEX_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
index 1b704d4f896..f9d2d86b142 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
@@ -114,18 +114,6 @@ TAO_Persistent_ExtId::hash (void) const
   return temp.hash ();
 }
 
-const char *
-TAO_Persistent_ExtId::id (void)
-{
-  return id_;
-}
-
-const char *
-TAO_Persistent_ExtId::kind (void)
-{
-  return kind_;
-}
-
 TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (void)
   : counter_ (0),
     hash_map_ (0)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
index 59a86851fa4..300cda47958 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
@@ -99,9 +99,6 @@ public:
   const char * kind_;
   // These point into shared/mmaped memory.
 
-  // Accessors.
-  const char * id (void);
-  const char * kind (void);
 };
 
 class TAO_ORBSVCS_Export TAO_Persistent_Index_IntId
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 1b9277dc1c6..b2cbe4e6b28 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -14,359 +14,613 @@
 #include "ace/Auto_Ptr.h"
 #include "Persistent_Naming_Context.h"
 #include "Persistent_Context_Index.h"
-#include "Bindings_Iterator_T.h"
 
-ACE_RCSID(Naming, Persistent_Naming_Context, "$Id$")
-
-int
-TAO_Persistent_Bindings_Map::unbind (const char *id,
-                                     const char *kind)
+ACE_RCSID(Naming, Persistent_Naming_Context, "$Id:")
+
+TAO_Persistent_Naming_Context::TAO_Persistent_Naming_Context(TAO_Naming_Context *interface,
+                                                             TAO_Index *context_index,
+                                                             PortableServer::POA_ptr poa,
+                                                             const char *poa_id,
+                                                             size_t default_hash_table_size)
+  : counter_ (0),
+    context_ (context_index->orb ()),
+    index_ (context_index),
+    poa_ (PortableServer::POA::_duplicate (poa)),
+    poa_id_ (poa_id),
+    lock_ (0),
+    hash_table_size_ (default_hash_table_size),
+    interface_ (interface)
 {
-  TAO_Persistent_ExtId name (id, kind);
-  TAO_Persistent_IntId entry;
-  if (this->map_->unbind (name, entry, this->allocator_) != 0)
-    return -1;
-  else
-    {
-      // Free up the memory we allocated in shared_bind().  Note that
-      // this assumes that the "ref" pointer comes first and that
-      // the ref, id and kind are contiguously allocated (see
-      // shared_bind() for details).
-      this->allocator_->free ((void *) (entry.ref_));
-      return 0;
-    }
+  // Get the lock from the ORB, which knows what type is appropriate.
+  // This method must be called AFTER the ORB has been initialized via
+  // <CORBA::ORB_init> since otherwise <TAO_ORB_Core_instance> won't
+  // work correctly...
+  ACE_ALLOCATOR (this->lock_,
+                 TAO_ORB_Core_instance ()->server_factory ()->create_servant_lock ());
+
+  interface_->impl (this);
 }
 
-int
-TAO_Persistent_Bindings_Map::bind (const char *id,
-                                   const char *kind,
-                                   CORBA::Object_ptr obj,
-                                   CosNaming::BindingType type)
+TAO_Persistent_Naming_Context::TAO_Persistent_Naming_Context(TAO_Naming_Context *interface,
+                                                             TAO_Index *context_index,
+                                                             PortableServer::POA_ptr poa,
+                                                             const char *poa_id,
+                                                             HASH_MAP *map,
+                                                             ACE_UINT32 *counter)
+  : counter_ (counter),
+    context_ (context_index->orb ()),
+    index_ (context_index),
+    poa_ (PortableServer::POA::_duplicate (poa)),
+    poa_id_ (poa_id),
+    lock_ (0),
+    hash_table_size_ (map->total_size ()),
+    interface_ (interface)
 {
-  return this->shared_bind (id, kind, obj, type, 0);
+  // Get the lock from the ORB, which knows what type is appropriate.
+  // This method must be called AFTER the ORB has been initialized via
+  // <CORBA::ORB_init> since otherwise <TAO_ORB_Core_instance> won't
+  // work correctly...
+  ACE_ALLOCATOR (this->lock_,
+                 TAO_ORB_Core_instance ()->server_factory ()->create_servant_lock ());
+
+  interface_->impl (this);
+  context_.set (map, index_->allocator ());
 }
 
 int
-TAO_Persistent_Bindings_Map::rebind (const char *id,
-                                     const char *kind,
-                                     CORBA::Object_ptr obj,
-                                     CosNaming::BindingType type)
+TAO_Persistent_Naming_Context::init (void)
 {
-  return this->shared_bind (id, kind, obj, type, 1);
+  return context_.open (hash_table_size_, index_->allocator ());
 }
 
-int
-TAO_Persistent_Bindings_Map::find (const char *id,
-                                   const char *kind,
-                                   CORBA::Object_ptr & obj,
-                                   CosNaming::BindingType &type)
+TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context (void)
 {
-  TAO_Persistent_ExtId name (id, kind);
-  TAO_Persistent_IntId entry;
-
-  if (this->map_->find (name,
-                        entry,
-                        this->allocator_) != 0)
-    return -1;
-  else
-    {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      obj = orb_->string_to_object (entry.ref_, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-      type = entry.type ();
+  delete this->lock_;
 
-      return 0;
-    }
+  // This should only get called if we are destroyed, i.e., we don't
+  // want persistent state.
+  // remove index entry.
+  index_->unbind (poa_id_.c_str ());
+  // clean up the map
+  context_.destroy ();
 }
 
-TAO_Persistent_Bindings_Map::TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb)
-  : allocator_ (0),
-    map_ (0),
-    orb_ (CORBA::ORB::_duplicate (orb))
+PortableServer::POA_ptr
+TAO_Persistent_Naming_Context::_default_POA (void)
 {
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
-TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map (void)
+CosNaming::NamingContext_ptr
+TAO_Persistent_Naming_Context::get_context (const CosNaming::Name &name,
+                                            CORBA::Environment &ACE_TRY_ENV)
 {
-}
+  // The naming context we will return.
+  CosNaming::NamingContext_var result =
+    CosNaming::NamingContext::_nil ();
+
+  // Create compound name to be resolved (<name> - last component).
+  // To avoid copying (and thus memory allocations), we can just reuse
+  // <name>'s buffer, since we will not be modifying it.
+  CORBA::ULong len = name.length ();
+  CosNaming::Name comp_name (name.maximum (),
+                             len - 1,
+                             ACE_const_cast
+                             (CosNaming::NameComponent*,
+                              name.get_buffer ()));
+  ACE_TRY
+    {
+      // Resolve the name.
+      CORBA::Object_var context = resolve (comp_name,
+                                           ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-void
-TAO_Persistent_Bindings_Map::destroy (void)
-{
-  allocator_->free (map_);
-}
+      // Try narrowing object reference to a context type.
+      result = CosNaming::NamingContext::_narrow (context.in (),
+                                                  ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+    {
+      // Add the last component of the name, which was stripped before
+      // the call to resolve.
+      CORBA::ULong rest_len = ex.rest_of_name.length ();
+      ex.rest_of_name.length (rest_len + 1);
+      ex.rest_of_name[rest_len] = name[len - 1];
 
-TAO_Persistent_Bindings_Map::HASH_MAP *
-TAO_Persistent_Bindings_Map::map (void)
-{
-  return map_;
-}
+      if (ex.why == CosNaming::NamingContext::not_object)
+        ex.why = CosNaming::NamingContext::missing_node;
 
-size_t
-TAO_Persistent_Bindings_Map::total_size (void)
-{
-  return map_->total_size ();
-}
+      ACE_RETHROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (result._retn ());
 
-size_t
-TAO_Persistent_Bindings_Map::current_size (void)
-{
-  return map_->current_size ();
+  // This has to be outside the TRY block, othewise we'll catch our
+  // own exception.
+  if (CORBA::is_nil (result.in ()))
+    {
+      CosNaming::Name rest;
+      rest.length (2);
+      rest[0] = name[len - 2];
+      rest[1] = name[len - 1];
+      ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
+                        (CosNaming::NamingContext::not_context,
+                         rest),
+                        result._retn());
+    }
+  // Finally, if everything went smoothly, just return the resolved
+  // context.
+  return result._retn ();
 }
 
-int
-TAO_Persistent_Bindings_Map::open (size_t hash_table_size,
-                                   ACE_Allocator *alloc)
+void
+TAO_Persistent_Naming_Context::bind (const CosNaming::Name& n,
+                                     CORBA::Object_ptr obj,
+                                     CORBA::Environment &ACE_TRY_ENV)
 {
-  allocator_ = alloc;
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK;
+
+  // Get the length of the name.
+  CORBA::ULong len = n.length ();
 
-  // Use allocator to allocate space for the hash map.
-  void *hash_map = 0;
-  size_t map_size = sizeof (HASH_MAP);
-  hash_map = this->allocator_->malloc (map_size);
-  //@@ check if hash_map == 0 ??
+  // Check for invalid name.
+  if (len == 0)
+    ACE_THROW (CosNaming::NamingContext::InvalidName());
 
-  // Initialize allocated hash map through placement new.
-  ACE_NEW_RETURN (this->map_,
-                  (hash_map) HASH_MAP (hash_table_size, this->allocator_),
-                  -1);
+  // If we received compound name, resolve it to get the context in
+  // which the binding should take place, then perform the binding on
+  // target context.
+  if (len > 1)
+    {
+      CosNaming::NamingContext_var context =
+        this->get_context (n, ACE_TRY_ENV);
+      ACE_CHECK;
 
-  return 0;
+      CosNaming::Name simple_name;
+      simple_name.length (1);
+      simple_name[0] = n[len - 1];
+      context->bind (simple_name, obj, ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+
+  // If we received a simple name, we need to bind it in this context.
+  else
+    {
+      // Try binding the name.
+      int result = this->context_.bind (n[0].id,
+                                        n[0].kind,
+                                        obj,
+                                        CosNaming::nobject);
+      if (result == 1)
+        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+
+      // Something went wrong with the internal structure
+      else if (result == -1)
+        ACE_THROW (CORBA::INTERNAL ());
+    }
 }
 
 void
-TAO_Persistent_Bindings_Map::set (HASH_MAP *map,
-                                  ACE_Allocator *alloc)
+TAO_Persistent_Naming_Context::rebind (const CosNaming::Name& n,
+                                       CORBA::Object_ptr obj,
+                                       CORBA::Environment &ACE_TRY_ENV)
 {
-  allocator_ = alloc;
-  map_ = map;
-}
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK;
 
-int
-TAO_Persistent_Bindings_Map::shared_bind (const char * id,
-                                          const char * kind,
-                                          CORBA::Object_ptr obj,
-                                          CosNaming::BindingType type,
-                                          int rebind)
-{
-  // 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);
-
-  // Calculate and allocate the memory we need to store this name to
-  // object binding.
-  size_t id_len = ACE_OS::strlen (id) + 1;
-  size_t kind_len = ACE_OS::strlen (kind) + 1;
-  size_t ref_len = ACE_OS::strlen (ref) + 1;
-  size_t total_len = id_len + kind_len + ref_len;
-  char *ptr = (char *) this->allocator_->malloc (total_len);
-
-  // Allocation failed - bail out.
-  if (ptr == 0)
-    return -1;
-
-  // Allocation succeded - place the data into the allocated memory
-  // and procceed.
-  else
+  // Get the length of the name.
+  CORBA::ULong len = n.length ();
+
+  // Check for invalid name.
+  if (len == 0)
+    ACE_THROW (CosNaming::NamingContext::InvalidName());
+
+  // If we received compound name, resolve it to get the context in
+  // which the rebinding should take place, then perform the rebinding
+  // on target context.
+  if (len > 1)
     {
-      // Note that the <ref> *must* come first to make sure we can
-      // retrieve this pointer later on in unbind().
-      char * ref_ptr = ptr;
-      char * id_ptr =  ptr + ref_len;
-      char * kind_ptr = ptr + ref_len + id_len;
-      ACE_OS::strcpy (ref_ptr, ref.in ());
-      ACE_OS::strcpy (id_ptr, id);
-      ACE_OS::strcpy (kind_ptr, kind);
-
-      TAO_Persistent_ExtId new_name (id_ptr, kind_ptr);
-      TAO_Persistent_IntId new_entry (ref_ptr, type);
-      int result = -1;
-
-      if (rebind == 0)
-        {
-          // Do a normal bind.  This will fail if there's already an
-          // <new_internal> with the same name.
-          result = this->map_->bind (new_name, new_entry, this->allocator_);
+      CosNaming::NamingContext_var context =
+        get_context (n, ACE_TRY_ENV);
+      ACE_CHECK;
 
-          if (result == 1)
-            {
-              // Entry already existed so bind failed. Free our
-              // dynamically allocated  memory.
-              this->allocator_->free ((void *) ptr);
-              return result;
-            }
-        }
-      else
-        {
-          // 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;
-
-          result = this->map_->rebind (new_name, new_entry,
-                                       old_name, old_entry,
-                                       this->allocator_);
-          if (result == 1)
-            {
-              // 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_);
-            }
-        }
+      CosNaming::Name simple_name;
+      simple_name.length (1);
+      simple_name[0] = n[len - 1];
+      context->rebind (simple_name, obj, ACE_TRY_ENV);
+      ACE_CHECK;
+    }
 
+  else
+    {
+      // If we received a simple name, we need to rebind it in this
+      // context.
+      // Try rebinding the name.
+      int result = this->context_.rebind (n[0].id,
+                                          n[0].kind,
+                                          obj,
+                                          CosNaming::nobject);
+      // Something went wrong with the internal structure
       if (result == -1)
-        // Free our dynamically allocated memory.
-        this->allocator_->free ((void *) ptr);
-      else
-        // 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);
-
-      return result;
+        ACE_THROW (CORBA::INTERNAL ());
     }
 }
 
-TAO_Persistent_Naming_Context::TAO_Persistent_Naming_Context (PortableServer::POA_ptr poa,
-                                                              const char *poa_id,
-                                                              TAO_Persistent_Context_Index *context_index)
-
-  : TAO_Hash_Naming_Context (poa,
-                             poa_id),
-    counter_ (0),
-    persistent_context_ (0),
-    index_ (context_index)
+void
+TAO_Persistent_Naming_Context::bind_context (const CosNaming::Name &n,
+                                             CosNaming::NamingContext_ptr nc,
+                                             CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_NEW (this->persistent_context_,
-           TAO_Persistent_Bindings_Map (context_index->orb ()));
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK;
+
+  // Get the length of the name.
+  CORBA::ULong len = n.length ();
+
+  // Check for invalid name.
+  if (len == 0)
+    ACE_THROW (CosNaming::NamingContext::InvalidName());
+
+  // If we received compound name, resolve it to get the context in
+  // which the binding should take place, then perform the binding on
+  // target context.
+  if (len > 1)
+    {
+      CosNaming::NamingContext_var context =
+        get_context (n, ACE_TRY_ENV);
+      ACE_CHECK;
 
-  // Set the superclass pointer.
-  context_ = persistent_context_;
+      CosNaming::Name simple_name;
+      simple_name.length (1);
+      simple_name[0] = n[len - 1];
+      context->bind_context (simple_name, nc, ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+  // If we received a simple name, we need to bind it in this context.
+  else
+    {
+      // Try binding the name.
+      int result = this->context_.bind (n[0].id,
+                                        n[0].kind,
+                                        nc,
+                                        CosNaming::ncontext);
+      if (result == 1)
+        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+
+      // Something went wrong with the internal structure
+      else if (result == -1)
+        ACE_THROW (CORBA::INTERNAL ());
+    }
 }
 
-TAO_Persistent_Naming_Context::TAO_Persistent_Naming_Context (PortableServer::POA_ptr poa,
-                                                              const char *poa_id,
-                                                              TAO_Persistent_Context_Index *context_index,
-                                                              HASH_MAP *map,
-                                                              ACE_UINT32 *counter)
-  : TAO_Hash_Naming_Context (poa,
-                             poa_id),
-    counter_ (counter),
-    persistent_context_ (0),
-    index_ (context_index)
+void
+TAO_Persistent_Naming_Context::rebind_context (const CosNaming::Name &n,
+                                               CosNaming::NamingContext_ptr nc,
+                                               CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_NEW (this->persistent_context_,
-           TAO_Persistent_Bindings_Map (context_index->orb ()));
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK;
+
+  // Get the length of the name.
+  CORBA::ULong len = n.length ();
 
-  // Set the superclass pointer.
-  context_ = persistent_context_;
+  // Check for invalid name.
+  if (len == 0)
+    ACE_THROW (CosNaming::NamingContext::InvalidName());
 
-  persistent_context_->set (map, index_->allocator ());
+  // If we received compound name, resolve it to get the context in
+  // which the rebinding should take place, then perform the rebinding
+  // on target context.
+  if (len > 1)
+    {
+      CosNaming::NamingContext_var context =
+        get_context (n, ACE_TRY_ENV);
+      ACE_CHECK;
+
+      CosNaming::Name simple_name;
+      simple_name.length (1);
+      simple_name[0] = n[len - 1];
+      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
+    // Try rebinding the name.
+    if (this->context_.rebind (n[0].id,
+                               n[0].kind,
+                               nc,
+                               CosNaming::ncontext) < 0)
+      ACE_THROW (CORBA::INTERNAL ());
 }
 
-int
-TAO_Persistent_Naming_Context::init (size_t hash_table_size)
+CORBA::Object_ptr
+TAO_Persistent_Naming_Context::resolve (const CosNaming::Name& n,
+                                        CORBA::Environment &ACE_TRY_ENV)
 {
-  return persistent_context_->open (hash_table_size, index_->allocator ());
+  CORBA::Object_ptr result = CORBA::Object::_nil ();
+  CosNaming::BindingType type;
+
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (result);
+
+  // Get the length of the name.
+  CORBA::ULong len = n.length ();
+
+  // Check for invalid name.
+  if (len == 0)
+    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
+                      result);
+
+  // Resolve the first component of the name.
+  if (this->context_.find (n[0].id,
+                           n[0].kind,
+                           result,
+                           type) == -1)
+    ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
+                      (CosNaming::NamingContext::not_object,
+                       n),
+                      result);
+  //@@ Once TAO_TRY_THROW is implemented, the whole if (len > 1) can be put in a try block
+  //with rethrow in CATCHANY.
+
+  // If the name we have to resolve is a compound name we need to
+  // recursively resolve it.
+  if (len > 1)
+    {
+      CosNaming::NamingContext_var context =
+        CosNaming::NamingContext::_nil ();
+      if (type == CosNaming::ncontext)
+        {
+          context = CosNaming::NamingContext::_narrow (result,
+                                                       ACE_TRY_ENV);
+          ACE_CHECK_RETURN (context._retn ());
+        }
+      else
+        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
+                                                              n),
+                          context._retn ());
+      if (CORBA::is_nil (context.in ()))
+        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
+                                                              n),
+                          context._retn ());
+      else
+        {
+          // Recursively call resolve on <n> without the first component.
+
+          // We need a name just like <n> but without the first
+          // component.  Instead of copying data we can reuse <n>'s
+          // buffer since we will only be using it for 'in' parameters
+          // (no modifications).
+          CosNaming::Name rest_of_name
+            (n.maximum () - 1,
+             n.length () - 1,
+             ACE_const_cast (CosNaming::NameComponent*,
+                             n.get_buffer ())
+             + 1);
+          // If there are any exceptions, they will propagate up.
+          return context->resolve (rest_of_name,
+                                   ACE_TRY_ENV);
+        }
+    }
+  // If the name we had to resolve was simple, we just need to return
+  // the result.  Since we don't want the result to be destroyed when
+  // this method returns we need to duplicate it.
+  return CORBA::Object::_duplicate (result);
 }
 
-TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context (void)
+void
+TAO_Persistent_Naming_Context::unbind (const CosNaming::Name& n,
+                                       CORBA::Environment &ACE_TRY_ENV)
 {
-  // This should only get called if we are destroyed, i.e., we don't
-  // want persistent state.
-  if (this->destroyed_)
+  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK;
+
+  // Get the length of the name.
+  CORBA::ULong len = n.length ();
+
+  // Check for invalid name.
+  if (len == 0)
+    ACE_THROW (CosNaming::NamingContext::InvalidName());
+
+  // If we received compound name, resolve it to get the context in
+  // which the unbinding should take place, then perform the unbinding
+  // on target context.
+  if (len > 1)
     {
-      // Remove ourselves from context index.
-      index_->unbind (poa_id_.c_str ());
-      // Remove the underlying data structure from persistent storage.
-      persistent_context_->destroy ();
+      CosNaming::NamingContext_var context =
+        get_context (n, ACE_TRY_ENV);
+      ACE_CHECK;
+
+      CosNaming::Name simple_name;
+      simple_name.length (1);
+      simple_name[0] = n[len - 1];
+      context->unbind (simple_name, ACE_TRY_ENV);
+      ACE_CHECK;
     }
+  // If we received a simple name, we need to unbind it in this
+  // context.
+  else
+    // Try unbinding the name.
+    if (this->context_.unbind (n[0].id, n[0].kind) == -1)
+      ACE_THROW (CosNaming::NamingContext::NotFound
+                 (CosNaming::NamingContext::not_object,
+                  n));
 }
 
-//@@This method may need adjustments to deal with errors correctly.
 CosNaming::NamingContext_ptr
 TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
+  ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
-                      this->lock_,
+                      *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.
+  TAO_Persistent_Naming_Context *c_impl = 0;
+  TAO_Naming_Context *c = 0;
   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.
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "Created a new Naming Context with poa_id %s and counter %d\n",
+                poa_id,
+                (*counter_)));
 
-  TAO_Persistent_Naming_Context *context_impl = 0;
-  ACE_NEW_THROW_EX (context_impl,
-                    TAO_Persistent_Naming_Context (poa_.in (),
-                                                   poa_id,
-                                                   index_),
+  ACE_NEW_THROW_EX (c,
+                    TAO_Naming_Context,
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (result._retn ());
 
-  // Put <context_impl> into the auto pointer temporarily, in case next
+  // Put c 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 (persistent_context_->total_size ()) == -1)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (), result._retn ());
+  ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
 
-  // Register with the index of Naming Contexts.
-  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 ());
-  //@@ At this point destroy_ flag should be enabled to avoid mem. leaks?
-
-  TAO_Naming_Context *context = 0;
-  ACE_NEW_THROW_EX (context,
-                    TAO_Naming_Context (context_impl),
+  ACE_NEW_THROW_EX (c_impl,
+                    TAO_Persistent_Naming_Context (c,
+                                                   index_,
+                                                   poa_.in (),
+                                                   poa_id,
+                                                   this->hash_table_size_),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (result._retn ());
 
-  // Change what we hold in auto pointer.
+  // Allocation succeeded, get rid of auto pointer.
+  if (c_impl->init () == -1)
+    {
+      delete c_impl;
+      return result._retn ();
+    }
+
   temp.release ();
-  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);
+  ACE_TRY
+    {
+      PortableServer::ObjectId_var id =
+        PortableServer::string_to_ObjectId (poa_id);
+
+      this->poa_->activate_object_with_id (id.in (),
+                                           c,
+                                           ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      result = c->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-  this->poa_->activate_object_with_id (id.in (),
-                                       context,
-                                       ACE_TRY_ENV);
+      // register with the index @@need to roll back in case this fails.
+      index_->bind (c_impl->poa_id_.c_str (),
+                    c_impl->counter_,
+                    c_impl->context_.map ());
+    }
+  ACE_CATCHANY
+    {
+      delete c;
+      ACE_RETHROW;
+    }
+  ACE_ENDTRY;
   ACE_CHECK_RETURN (result._retn ());
 
-  result = context->_this (ACE_TRY_ENV);
+  return result._retn ();
+}
+
+CosNaming::NamingContext_ptr
+TAO_Persistent_Naming_Context::bind_new_context (const CosNaming::Name& n,
+                                                 CORBA::Environment &ACE_TRY_ENV)
+{
+  ACE_GUARD_THROW_EX (ACE_Lock,
+                      ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
-  // Give POA the ownership of this servant.
-  context->_remove_ref (ACE_TRY_ENV);
+  CosNaming::NamingContext_var result =
+    CosNaming::NamingContext::_nil ();
+
+  result = new_context (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+
+  ACE_TRY
+    {
+      bind_context (n,
+                    result.in (),
+                    ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      {
+        ACE_DECLARE_NEW_CORBA_ENV;
+        result->destroy (ACE_TRY_ENV);
+      }
+      ACE_RETHROW;
+    }
+  ACE_ENDTRY;
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
-  // Everything went without errors: release auto pointer and return.
-  temp2.release ();
   return result._retn ();
 }
 
 void
+TAO_Persistent_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
+{
+  {
+    ACE_GUARD_THROW_EX (ACE_Lock,
+                        ace_mon,
+                        *this->lock_,
+                        CORBA::INTERNAL ());
+    ACE_CHECK;
+
+    if (this->context_.current_size () != 0)
+      ACE_THROW (CosNaming::NamingContext::NotEmpty());
+
+    PortableServer::POA_var poa =
+      this->_default_POA ();
+
+    PortableServer::ObjectId_var id =
+      poa->servant_to_id (interface_,
+                          ACE_TRY_ENV);
+    ACE_CHECK;
+
+    poa->deactivate_object (id.in (),
+                            ACE_TRY_ENV);
+    ACE_CHECK;
+  }
+
+  // Let go of the lock and kill the interface, which will, in turn,
+  // invoke our destructor.  We *must* be dynamically allocated for this to work right...
+  // The code below, and in <destroy> in general, should NOT be
+  // factored into the TAO_Naming_Context, because only the *concrete
+  // implementation* knows how to clean up appropriately, e.g., we may
+  // have one servant serving many objects and will not want to delete
+  // the servant in <destroy>.
+
+  //@@ Now that the POA has been fixed to work right, this is no
+  // longer a correct approach to disposing off the servants.  This is
+  // a temporary fix to avoid crashing (but with the memory leak), a
+  // proper fix will be in the next release.
+  //  delete interface_;
+}
+
+void
 TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
                                      CosNaming::BindingList_out &bl,
                                      CosNaming::BindingIterator_out &bi,
@@ -381,140 +635,272 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
   ACE_CHECK;
 
   // Obtain a lock before we proceed with the operation.
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
+  ACE_GUARD_THROW_EX (ACE_Lock,
                       ace_mon,
-                      this->lock_,
+                      *this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
   // Dynamically allocate hash map iterator.
-  HASH_MAP::ITERATOR *hash_iter = 0;
+  TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR *hash_iter = 0;
   ACE_NEW_THROW_EX (hash_iter,
-                    HASH_MAP::ITERATOR
-                    (*persistent_context_->map ()),
+                    TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR
+                    (*(context_.map ())),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  // Store <hash_iter temporarily in auto pointer, in case we'll have
-  // some failures and throw an exception.
-  ACE_Auto_Basic_Ptr<HASH_MAP::ITERATOR> temp (hash_iter);
-
-  // 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_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;
-
-  // A pointer to BindingIterator servant.
-  ITER_SERVANT *bind_iter = 0;
-
   // Number of bindings that will go into the BindingList.
   CORBA::ULong n;
 
+  // A pointer to BindingIterator servant.
+  TAO_Persistent_Binding_Iterator *bind_iter = 0;
+
   // Calculate number of bindings that will go into bl.
-  if (this->context_->current_size () > how_many)
+  if (this->context_.current_size () > how_many)
     n = how_many;
   else
-    n = this->context_->current_size ();
+    n = this->context_.current_size ();
 
   // Use hash iterator to populate a BindingList with bindings.
   bl->length (n);
 
-  ENTRY_DEF *hash_entry;
+  TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry;
 
   for (CORBA::ULong i = 0; i < n; i++)
     {
       hash_iter->next (hash_entry);
       hash_iter->advance ();
 
-      if (ITER_SERVANT::populate_binding (hash_entry, bl[i]) == 0)
+      if (populate_binding (hash_entry, bl[i]) == 0)
+        {
+          delete hash_iter;
           ACE_THROW (CORBA::NO_MEMORY());
+        }
     }
 
   // Now we are done with the BindingsList, and we can follow up on
   // the iterator business.
 
   // If we do not need to pass back BindingIterator.
-  if (this->context_->current_size () <= how_many)
-    return;
+  if (this->context_.current_size () <= how_many)
+    delete hash_iter;
   else
     {
       // Create a BindingIterator for return.
-      ACE_NEW_THROW_EX (bind_iter,
-                        ITER_SERVANT (hash_iter, this->poa_.in (), this->lock_),
-                        CORBA::NO_MEMORY ());
-
-      // Release <hash_iter> from auto pointer and put <bind_iter> into
-      // one.
-      temp.release ();
-      ACE_Auto_Basic_Ptr<ITER_SERVANT> temp2 (bind_iter);
-
-      // Register with the POA.
-      char poa_id[BUFSIZ];
-      ACE_OS::sprintf (poa_id,
-                       "%s_%ld",
-                       this->poa_id_.c_str (),
-                       this->counter_++);
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId (poa_id);
 
-      this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter,
-                                           ACE_TRY_ENV);
-      ACE_CHECK;
+      bind_iter = new TAO_Persistent_Binding_Iterator (hash_iter, this->poa_.in (), this->lock_);
+      if (bind_iter == 0)
+        {
+          delete hash_iter;
+          ACE_THROW (CORBA::NO_MEMORY ());
+        }
 
-      bi = bind_iter->_this (ACE_TRY_ENV);
-      ACE_CHECK;
+      ACE_TRY
+        {
+          char poa_id[BUFSIZ];
+          ACE_OS::sprintf (poa_id,
+                           "%s_%ld",
+                           this->poa_id_.c_str (),
+                           (*this->counter_)++);
+
+          PortableServer::ObjectId_var id =
+            PortableServer::string_to_ObjectId (poa_id);
+
+          this->poa_->activate_object_with_id (id.in (),
+                                               bind_iter,
+                                               ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          bi = bind_iter->_this (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
 
-      // Give POA the ownership of this servant.
-      bind_iter->_remove_ref (ACE_TRY_ENV);
+        }
+      ACE_CATCHANY
+        {
+          delete bind_iter;
+          ACE_RETHROW;
+        }
+      ACE_ENDTRY;
       ACE_CHECK;
+    }
+}
+
+TAO_Persistent_Binding_Iterator::TAO_Persistent_Binding_Iterator (TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR *hash_iter,
+                                                                  PortableServer::POA_ptr poa,
+                                                                  ACE_Lock *lock)
+  : hash_iter_ (hash_iter),
+    lock_ (lock),
+    poa_ (PortableServer::POA::_duplicate (poa))
+
+{
+}
+
+TAO_Persistent_Binding_Iterator::~TAO_Persistent_Binding_Iterator (void)
+{
+  delete hash_iter_;
+}
+
+// Return the Default POA of this Servant
+PortableServer::POA_ptr
+TAO_Persistent_Binding_Iterator::_default_POA (CORBA::Environment &/*env*/)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
+CORBA::Boolean
+TAO_Persistent_Binding_Iterator::next_one (CosNaming::Binding_out b,
+                                           CORBA::Environment &ACE_TRY_ENV)
+{
+  CosNaming::Binding *binding;
+
+  // Allocate a binding to be returned (even if there no more
+  // bindings, we need to allocate an out parameter.)
+  ACE_NEW_THROW_EX (binding,
+                    CosNaming::Binding,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
 
-      // Everything went without error, release the auto pointer.
-      temp2.release ();
+  b = binding;
+
+  ACE_GUARD_THROW_EX (ACE_Lock,
+                      ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+  // If there are no more bindings.
+  if (hash_iter_->done ())
+    return 0;
+  else
+    {
+      TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry;
+      hash_iter_->next (hash_entry);
+
+      if (TAO_Persistent_Naming_Context::populate_binding (hash_entry, *binding) == 0)
+        ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+
+      hash_iter_->advance ();
+      return 1;
     }
 }
 
-//@@ Need instantiation for TAO_Bindings_Iterator.
+int
+TAO_Persistent_Naming_Context::populate_binding (TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry,
+                                                 CosNaming::Binding &b)
+{
+  b.binding_type = hash_entry->int_id_.type_;
+  b.binding_name.length (1);
+
+  // Here we perform a check before assignment to make sure
+  // CORBA::string_dup is not called on 0 pointer, since the spec does
+  // not say what should happen in that case.
+  if (hash_entry->ext_id_.id_ != 0)
+    {
+      b.binding_name[0].id =
+        CORBA::string_dup (hash_entry->ext_id_.id_);
+      if (b.binding_name[0].id.in () == 0)
+        return 0;
+    }
+  if (hash_entry->ext_id_.kind_ != 0)
+    {
+      b.binding_name[0].kind =
+        CORBA::string_dup (hash_entry->ext_id_.kind_);
+      if (b.binding_name[0].kind.in () == 0)
+        return 0;
+    }
+  return 1;
+}
+
+CORBA::Boolean
+TAO_Persistent_Binding_Iterator::next_n (CORBA::ULong how_many,
+                                         CosNaming::BindingList_out bl,
+                                         CORBA::Environment &ACE_TRY_ENV)
+{
+  // We perform an allocation before obtaining the lock so that an out
+  // parameter is allocated in case we fail to obtain the lock.
+  ACE_NEW_THROW_EX (bl,
+                    CosNaming::BindingList (0),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  // Obtain a lock.
+  ACE_GUARD_THROW_EX (ACE_Lock,
+                      ace_mon,
+                      *this->lock_,
+                      CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (0);
+
+  // If there are no more bindings...
+  if (hash_iter_->done ())
+      return 0;
+  else
+    {
+      // Initially assume that iterator has the requested number of
+      // bindings.
+      bl->length (how_many);
+
+      TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry;
+
+      // Iterate and populate the BindingList.
+
+      for (CORBA::ULong i = 0; i < how_many; i++)
+        {
+          hash_iter_->next (hash_entry);
+
+          if (TAO_Persistent_Naming_Context::populate_binding (hash_entry, bl[i]) == 0)
+            ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+
+          if (hash_iter_->advance () == 0)
+            {
+              // 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;
+            }
+        }
+      return 1;
+    }
+}
+
+void
+TAO_Persistent_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+{
+  {
+    ACE_GUARD_THROW_EX (ACE_Lock,
+                        ace_mon,
+                        *this->lock_,
+                        CORBA::INTERNAL ());
+    ACE_CHECK;
+
+    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;
+  }
+
+  // Let go of the lock and commit suicide: must have been dynamically allocated
+  //@@ Now that the POA has been fixed to work right, this is no
+  // longer a correct approach to disposing off the servants.  This is
+  // a temporary fix to avoid crashing (but with the memory leak), a
+  // proper fix will be in the next release.
+  //  delete this;
+}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-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>;
-template class ACE_Hash<TAO_Persistent_ExtId>;
-template class ACE_Equal_To<TAO_Persistent_ExtId>;
-template class ACE_Hash_Map_Iterator_Base_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_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>;
-template class 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 ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>;
+
 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> > >;
+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_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>
-#pragma instantiate ACE_Hash<TAO_Persistent_ExtId>
-#pragma instantiate ACE_Equal_To<TAO_Persistent_ExtId>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_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_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>
-#pragma instantiate 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>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context>
-#pragma instantiate 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> >
-#pragma instantiate 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> >
-#pragma instantiate 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> > >
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,  TAO_Persistent_Index_IntId>::ITERATOR>
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index 31bc78138d1..42145b8e3c1 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -16,190 +16,189 @@
 #ifndef TAO_PERSISTENT_NAMING_CONTEXT_H
 #define TAO_PERSISTENT_NAMING_CONTEXT_H
 
-#include "Hash_Naming_Context.h"
-#include "Persistent_Entries.h"
+#include "Naming_Context.h"
+#include "Persistent_Bindings_Map.h"
 
-class TAO_ORBSVCS_Export TAO_Persistent_Bindings_Map : public TAO_Bindings_Map
-{
-  // = TITLE
-  //     Provides hash-table-based persistent storage for
-  //     name to object  bindings in a Naming Context.
-  //
-  // = DESCRIPTION
-  //     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_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId> HASH_MAP;
-  // Underlying data structure - typedef for ease of use.
-
-  // = Initialization and termination methods.
-
-  TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb);
-  // Constructor.
-
-  int open (size_t hash_map_size,
-            ACE_Allocator *alloc);
-  // Allocate hash map of size <hash_map_size> from persistent storage
-  // using the <alloc>.
-
-  void set (HASH_MAP *map,
-            ACE_Allocator *alloc);
-  // The hash map has already been preallocated for us.  We just need
-  // to set our data members take ownership of it.
-
-  virtual ~TAO_Persistent_Bindings_Map (void);
-  // Destructor.  Does not deallocate the hash map: if an instance of
-  // this class goes out of scope, its hash_map remains in persistent storage.
-
-  void destroy (void);
-  // This method removes the hash map from persistent storage/frees up
-  // the memory.  The hash map better be empty, since we are not
-  // cleaning up the insides. (We could add <close> to clean entries,
-  // but not the data inside the entries.
-
-  // = Accessor methods.
-
-  HASH_MAP *map (void);
-  // Get a pointer to the underlying hash map.
-
-  size_t total_size (void);
-  // Return the size of the underlying hash table.
-
-  virtual size_t current_size (void);
-  // Return the size of the underlying hash table.
-
-  // = Name bindings manipulation methods.
-
-  virtual int bind (const char *id,
-                    const char *kind,
-                    CORBA::Object_ptr obj,
-                    CosNaming::BindingType type);
-  // Add a binding with the specified parameters to the table.
-  // Return 0 on success and -1 on failure, 1 if there already is a
-  // binding with <id> and <kind>.
-
-  virtual int rebind (const char *id,
-                      const char *kind,
-                      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.  Returns
-  // -1 on failure.
-
-  virtual int unbind (const char * id,
-                      const char * kind);
-  // Remove a binding containing <id> and <kind> from the table.
-  // Return 0 on success and -1 on failure.
-
-  virtual int find (const char * id,
-                    const char * kind,
-                    CORBA::Object_ptr & obj,
-                    CosNaming::BindingType &type);
-  // Find the binding containing <id> and <kind> in the table, and
-  // pass binding's type and object back to the caller by reference.
-  // Return 0 on success and -1 on failure.  Note: a 'duplicated' object
-  // reference is assigned to <obj>, so the caller is responsible for
-  // its deallocation.
-
-protected:
-
-  int shared_bind (const char *id,
-                   const char *kind,
-                   CORBA::Object_ptr obj,
-                   CosNaming::BindingType type,
-                   int rebind);
-  // Helper: factors common code from <bind> and <rebind>.
-
-  ACE_Allocator *allocator_;
-  // Pointer to the allocator we use to make bindings persistent.
+class TAO_Index;
 
-  HASH_MAP *map_;
-  // Pointer to the underlying hash map.
-
-  CORBA::ORB_var orb_;
-  // Pointer to the orb.  We need it to do string/object conversions.
-};
-
-class TAO_Persistent_Context_Index;
-
-class TAO_ORBSVCS_Export TAO_Persistent_Naming_Context : public TAO_Hash_Naming_Context
+class TAO_ORBSVCS_Export TAO_Persistent_Naming_Context : public TAO_Naming_Context_Impl
 {
   // = TITLE
   //     This class plays a role of a 'ConcreteImplementor' in the
-  //     Bridge pattern architecture of the CosNaming::NamingContext implementation.
+  //     Bridge pattern architecture of the Naming Service
+  //     implementation.  This implementation of the NamingContext
+  //     uses ACE_Hash_Map_Manager to store name bindings.
   //
   // = DESCRIPTION
-  //     This class provides a persistent implementation of the
-  //     NamingContext functionality, i.e., the state is preserved across
-  //     process boundaries.  Derives from TAO_Hash_Naming_Context and
-  //     uses TAO_Persistent_Bindings_Map to store name to object bindings.
-  //
+  //     Extensive idl method descriptions can be found in Naming_Context.h
+
 public:
   typedef TAO_Persistent_Bindings_Map::HASH_MAP HASH_MAP;
-  // Underlying data structure - typedef for ease of use.
 
   // = Initialization and termination methods.
-
-  TAO_Persistent_Naming_Context (PortableServer::POA_ptr poa,
+  TAO_Persistent_Naming_Context (TAO_Naming_Context *interface,
+                                 TAO_Index *context_index,
+                                 PortableServer::POA_ptr poa,
                                  const char *poa_id,
-                                 TAO_Persistent_Context_Index *context_index);
-  // Constructor.  MUST be followed up by <init> to allocate the
-  // underlying data structure from persistent storage!
+                                 size_t default_hash_table_size = ACE_DEFAULT_MAP_SIZE);
+  // Default constructor.  Sets the implementation pointer of the interface.
 
-  int init (size_t hash_table_size = ACE_DEFAULT_MAP_SIZE);
-  // Allocate the underlying data structure from persistent storage.
-  // Returns 0 on success and -1 on failure.
-
-  TAO_Persistent_Naming_Context (PortableServer::POA_ptr poa,
+  TAO_Persistent_Naming_Context (TAO_Naming_Context *interface,
+                                 TAO_Index *context_index,
+                                 PortableServer::POA_ptr poa,
                                  const char *poa_id,
-                                 TAO_Persistent_Context_Index *context_index,
                                  HASH_MAP * map,
                                  ACE_UINT32 *counter);
-  // Constructor that takes in preallocated data structure and takes
-  // ownership of it.  This constructor is for 'recreating' servants
-  // from persistent state.
+  // Constructor for recreation.
 
   virtual ~TAO_Persistent_Naming_Context (void);
-  // Destructor.
+  // destructor.
+
+  int init (void);
+  // Allocate the map.
+
+  // = CosNaming::NamingContext idl interface methods.
+  virtual void bind (const CosNaming::Name &n,
+                     CORBA::Object_ptr obj,
+                     CORBA::Environment &ACE_TRY_ENV);
+
+  virtual void rebind (const CosNaming::Name &n,
+                       CORBA::Object_ptr obj,
+                       CORBA::Environment &ACE_TRY_ENV);
+
+  virtual void bind_context (const CosNaming::Name &n,
+                             CosNaming::NamingContext_ptr nc,
+                             CORBA::Environment &ACE_TRY_ENV);
 
-  // = Methods not implemented in TAO_Hash_Naming_Context.
+  virtual void rebind_context (const CosNaming::Name &n,
+                               CosNaming::NamingContext_ptr nc,
+                               CORBA::Environment &ACE_TRY_ENV);
+
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
+                                     CORBA::Environment &ACE_TRY_ENV);
+
+  virtual void unbind (const CosNaming::Name &n,
+                       CORBA::Environment &ACE_TRY_ENV);
 
   virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV);
-  // This operation returns a new naming context implemented by the
-  // same naming server in which the operation was invoked.  The
-  // context is not bound.
+
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
+                                                         CORBA::Environment &ACE_TRY_ENV);
+
+  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
 
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
                      CosNaming::BindingIterator_out &bi,
                      CORBA::Environment &ACE_TRY_ENV);
-  // Returns at most the requested number of bindings <how_many> in
-  // <bl>.  If the naming context contains additional bindings, they
-  // are returned with a BindingIterator.  In the naming context does
-  // not contain any additional bindings <bi> returned as null.
 
+  virtual PortableServer::POA_ptr _default_POA (void);
+  // Returns the Default POA of this Servant object
+
+  // = Helper functions.
+  static int populate_binding (TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry,
+                               CosNaming::Binding &b);
+  // Helper function used by TAO_Persistent_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.
 
   ACE_UINT32 *counter_;
-  // Counter used for generation of POA ids for children Naming
-  // Contexts.
+  // Counter used for generation of POA ids for objects created by
+  // this 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.
+  TAO_Persistent_Bindings_Map context_;
+  // This implementation of <NamingContext> uses <ACE_Hash_Map> for
+  // storage and manipulation of name-object bindings.
 
 protected:
+  // = These are the helper methods used by other methods.
+
+  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name,
+                                            CORBA::Environment &_env);
+  // This is used by methods that need to resolve a compound name to
+  // get the reference to the target context before performing the
+  // actual operation (e.g. bind, unbind, etc.)  Takes a full name
+  // (including the last component that doesn't need to be resolved)
+  // Returns a pointer to the target context.
 
-  TAO_Persistent_Context_Index *index_;
+  TAO_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
   // new context or destroy one, we need to make an entry there.
   // Also, we get the allocator needed to initialize us from this guy.
+
+  PortableServer::POA_var poa_;
+  // POA we are registered with.
+
+  ACE_CString poa_id_;
+  // ID with which we are registered with <poa_>.
+
+  ACE_Lock *lock_;
+  // Lock to serialize access to the underlying data structure.  This
+  // is a lock adapter that hides the type of lock, which may be a
+  // null lock if the ORB decides threading is not necessary.
+
+  size_t hash_table_size_;
+  // Hash table size.
+
+  TAO_Naming_Context *interface_;
+  // Pointer to the 'Abstraction' in the bridge pattern.  We need this
+  // pointer so that we can clean up the Abstraction as necessary when <destroy>
+  // method is called.  The reason we need to clean up as opposed to
+  // the Abstraction itself is that we, the concrete implementation,  have the *knowledge* of how
+  // to do this, e.g., we may have one servant serving many objects
+  // and would not want to delete the servant in the <destroy> operation.
+};
+
+class TAO_ORBSVCS_Export TAO_Persistent_Binding_Iterator :
+  public POA_CosNaming::BindingIterator
+{
+  // = TITLE
+  //     This class implements the <BindingIterator> interface that is
+  //     part of the <CosNaming> idl module based on the Hash_Map
+  //     implementation for CosNaming::NamingContext.
+  //
+  // = DESCRIPTION
+  //     <TAO_Persistent_Binding_Iterator> constructor expects a pointer to a
+  //     dynamically allocated hash map iterator. Destructor
+  //     deallocates hash map iterator.
+public:
+  // = Intialization and termination methods.
+  TAO_Persistent_Binding_Iterator (TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR *hash_iter,
+                                   PortableServer::POA_ptr poa,
+                                   ACE_Lock *lock);
+  // Constructor.
+
+  ~TAO_Persistent_Binding_Iterator (void);
+  // Destructor.
+
+  // Returns the Default POA of this Servant object
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+
+  CORBA::Boolean next_one (CosNaming::Binding_out b,
+                           CORBA::Environment &ACE_TRY_ENV);
+  // 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);
+  // This operation returns at most the requested number of bindings.
+
+  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  // This operation destroys the iterator.
+
+private:
+  TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR *hash_iter_;
+  // A pointer to the hash map iterator.
+
+  ACE_Lock *lock_;
+  // Lock passed on from <TAO_NamingContext> to serialize access to the
+  // internal data structure.
+
+  PortableServer::POA_var poa_;
+  // Implement a different _default_POA()
 };
 
 #endif /* TAO_PERSISTENT_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/README b/TAO/orbsvcs/orbsvcs/Naming/README
index 9cccf13e622..ecec41946a3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/README
+++ b/TAO/orbsvcs/orbsvcs/Naming/README
@@ -50,37 +50,4 @@ 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
-
-- 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
+and in the source code.
\ No newline at end of file
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
deleted file mode 100644
index 1661f6ef0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Transient_Naming_Context.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu> and
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
-#include "ace/Auto_Ptr.h"
-#include "Transient_Naming_Context.h"
-#include "Bindings_Iterator_T.h"
-
-ACE_RCSID(Naming, Transient_Naming_Context, "$Id$")
-
-int
-TAO_Transient_Bindings_Map::unbind (const char *id,
-                                    const char *kind)
-{
-  TAO_ExtId name (id, kind);
-  return this->map_.unbind (name);
-}
-
-int
-TAO_Transient_Bindings_Map::bind (const char *id,
-                                  const char *kind,
-                                  CORBA::Object_ptr obj,
-                                  CosNaming::BindingType type)
-{
-  return this->shared_bind (id, kind, obj, type, 0);
-}
-
-int
-TAO_Transient_Bindings_Map::rebind (const char *id,
-                                    const char *kind,
-                                    CORBA::Object_ptr obj,
-                                    CosNaming::BindingType type)
-{
-  return this->shared_bind (id, kind, obj, type, 1);
-}
-
-int
-TAO_Transient_Bindings_Map::find (const char *id,
-                                  const char *kind,
-                                  CORBA::Object_ptr & obj,
-                                  CosNaming::BindingType &type)
-{
-  TAO_ExtId name (id, kind);
-  TAO_IntId entry;
-
-  if (this->map_.find (name,
-                       entry) != 0)
-    return -1;
-  else
-    {
-      obj = CORBA::Object::_duplicate (entry.ref_);
-      type = entry.type_;
-      return 0;
-    }
-}
-
-TAO_Transient_Bindings_Map::TAO_Transient_Bindings_Map (size_t hash_table_size)
-  : map_ (hash_table_size)
-{
-}
-
-TAO_Transient_Bindings_Map::~TAO_Transient_Bindings_Map (void)
-{
-}
-
-TAO_Transient_Bindings_Map::HASH_MAP &
-TAO_Transient_Bindings_Map::map (void)
-{
-  return map_;
-}
-
-size_t
-TAO_Transient_Bindings_Map::current_size (void)
-{
-  return map_.current_size ();
-}
-
-size_t
-TAO_Transient_Bindings_Map::total_size (void)
-{
-  return map_.total_size ();
-}
-
-int
-TAO_Transient_Bindings_Map::shared_bind (const char * id,
-                               const char * kind,
-                               CORBA::Object_ptr obj,
-                               CosNaming::BindingType type,
-                               int rebind)
-{
-  TAO_ExtId new_name (id, kind);
-  TAO_IntId new_entry (obj, type);
-
-  if (rebind == 0)
-    // Do a normal bind.
-    return this->map_.bind (new_name, new_entry);
-
-  else
-    // Rebind.
-    return this->map_.rebind (new_name, new_entry);
-}
-
-TAO_Transient_Naming_Context::TAO_Transient_Naming_Context (PortableServer::POA_ptr poa,
-                                                            const char *poa_id,
-                                                            size_t hash_table_size)
-  : TAO_Hash_Naming_Context (poa,
-                             poa_id),
-    counter_ (0),
-    transient_context_ (0)
-{
-  ACE_NEW (this->transient_context_,
-           TAO_Transient_Bindings_Map (hash_table_size));
-
-  context_ = transient_context_;
-}
-
-TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context (void)
-{
-}
-
-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 ());
-
-  // 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_.in (),
-                                                  poa_id,
-                                                  transient_context_->total_size ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
-
-  // 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_THROW_EX (context,
-                    TAO_Naming_Context (context_impl),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
-
-  // Change what we hold in auto pointer.
-  temp.release ();
-  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);
-
-  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 ());
-
-  // 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 ();
-}
-
-void
-TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
-                                    CosNaming::BindingList_out &bl,
-                                    CosNaming::BindingIterator_out &bi,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Allocate nil out parameters in case we won't be able to complete
-  // the operation.
-  bi = CosNaming::BindingIterator::_nil ();
-  ACE_NEW_THROW_EX (bl,
-                    CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  // Obtain a lock before we proceed with the operation.
-  ACE_GUARD_THROW_EX (ACE_SYNCH_RECURSIVE_MUTEX,
-                      ace_mon,
-                      this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
-
-  // Check to make sure this object didn't have <destroy> method
-  // invoked on it.
-  if (this->destroyed_)
-    ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-
-  // Dynamically allocate iterator for traversing the underlying hash map.
-  HASH_MAP::ITERATOR *hash_iter = 0;
-  ACE_NEW_THROW_EX (hash_iter,
-                    HASH_MAP::ITERATOR (transient_context_->map ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  // Store <hash_iter temporarily in auto pointer, in case we'll have
-  // some failures and throw an exception.
-  ACE_Auto_Basic_Ptr<HASH_MAP::ITERATOR> temp (hash_iter);
-
-  // 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_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>::ITERATOR ITER_DEF;
-  typedef ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>::ENTRY ENTRY_DEF;
-
-  // Typedef to the type of BindingIterator servant for ease of use.
-  typedef TAO_Bindings_Iterator<ITER_DEF, ENTRY_DEF>
-    ITER_SERVANT;
-
-  // A pointer to BindingIterator servant.
-  ITER_SERVANT *bind_iter = 0;
-
-  // Number of bindings that will go into the BindingList <bl>.
-  CORBA::ULong n;
-
-  // Calculate number of bindings that will go into <bl>.
-  if (this->context_->current_size () > how_many)
-    n = how_many;
-  else
-    n = this->context_->current_size ();
-
-  // Use the hash map iterator to populate <bl> with bindings.
-  bl->length (n);
-
-  ENTRY_DEF *hash_entry;
-
-  for (CORBA::ULong i = 0; i < n; i++)
-    {
-      hash_iter->next (hash_entry);
-      hash_iter->advance ();
-
-      if (ITER_SERVANT::populate_binding (hash_entry, bl[i]) == 0)
-          ACE_THROW (CORBA::NO_MEMORY());
-    }
-
-  // Now we are done with the BindingsList, and we can follow up on
-  // the BindingIterator business.
-
-  // If we do not need to pass back BindingIterator.
-  if (this->context_->current_size () <= how_many)
-    return;
-  else
-    {
-      // Create a BindingIterator for return.
-      ACE_NEW_THROW_EX (bind_iter,
-                        ITER_SERVANT (hash_iter, this->poa_.in (), this->lock_),
-                        CORBA::NO_MEMORY ());
-
-      // Release <hash_iter> from auto pointer and put <bind_iter> into
-      // one.
-      temp.release ();
-      ACE_Auto_Basic_Ptr<ITER_SERVANT> temp2 (bind_iter);
-
-      // Register with the POA.
-      char poa_id[BUFSIZ];
-      ACE_OS::sprintf (poa_id,
-                       "%s_%ld",
-                       this->poa_id_.c_str (),
-                       this->counter_++);
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId (poa_id);
-
-      this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter,
-                                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      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)
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId>;
-template class TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId> >;
-template class ACE_Auto_Basic_Ptr<TAO_Transient_Naming_Context>;
-template class ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId> > >;
-template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex> >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>
-
-#pragma instantiate ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId>
-#pragma instantiate TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId> >
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Transient_Naming_Context>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Bindings_Iterator<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>, ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId> > >
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex> >
-#endif /* 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
deleted file mode 100644
index 7ed16d5c5f2..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Transient_Naming_Context.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_TRANSIENT_NAMING_CONTEXT_H
-#define TAO_TRANSIENT_NAMING_CONTEXT_H
-
-#include "Hash_Naming_Context.h"
-#include "Entries.h"
-#include "ace/Hash_Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORBSVCS_Export TAO_Transient_Bindings_Map : public TAO_Bindings_Map
-{
-  // = TITLE
-  //   Provides hash-table-based transient storage for name to object bindings in a
-  //   Naming Context.
-  //
-  // = DESCRIPTION
-  //   A thin wrapper on top of ACE_Hash_Map_Manager.  Supports
-  //   TAO_Bindings_Map interface.  Used by TAO_Transient_Naming_Context.
-public:
-
-  typedef ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex> HASH_MAP;
-  // Underlying data structure - typedef for ease of use.
-
-  // = Initialization and termination methods.
-
-  TAO_Transient_Bindings_Map (size_t hash_table_size);
-  // Constructor.
-
-  virtual ~TAO_Transient_Bindings_Map (void);
-  // Destructor.
-
-  // = Accessors.
-
-  HASH_MAP &map (void);
-  // Get a reference to the underlying hash map.
-
-  size_t total_size (void);
-  // Return the size of the underlying hash table.
-
-  virtual size_t current_size (void);
-  // Return current number of entries (name bindings) in the
-  // underlying hash map.
-
-  // = Name bindings manipulation methods.
-
-  virtual int bind (const char *id,
-                    const char *kind,
-                    CORBA::Object_ptr obj,
-                    CosNaming::BindingType type);
-  // Add a binding with the specified parameters to the table.
-  // Return 0 on success and -1 on failure, 1 if there already is a
-  // binding with <id> and <kind>.
-
-  virtual int rebind (const char *id,
-                      const char *kind,
-                      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.  Returns
-  // -1 on failure.
-
-  virtual int unbind (const char * id,
-                      const char * kind);
-  // Remove a binding containing <id> and <kind> from the table.
-  // Return 0 on success and -1 on failure.
-
-  virtual int find (const char * id,
-                    const char * kind,
-                    CORBA::Object_ptr & obj,
-                    CosNaming::BindingType &type);
-  // Find the binding containing <id> and <kind> in the table, and
-  // pass binding's type and object back to the caller by reference.
-  // Return 0 on success and -1 on failure.  Note: a 'duplicated' object
-  // reference is assigned to <obj>, so the caller is responsible for
-  // its deallocation.
-
-private:
-
-  int shared_bind (const char *id,
-                   const char *kind,
-                   CORBA::Object_ptr obj,
-                   CosNaming::BindingType type,
-                   int rebind);
-  // Helper: factors common code from <bind> and <rebind>.
-
-  HASH_MAP map_;
-  // Hash map used for storage.
-};
-
-class TAO_ORBSVCS_Export TAO_Transient_Naming_Context : public TAO_Hash_Naming_Context
-{
-  // = TITLE
-  //     This class plays a role of a 'ConcreteImplementor' in the
-  //     Bridge pattern architecture of the CosNaming::NamingContext
-  //     implementation.
-  //
-  // = DESCRIPTION
-  //     This class provides a transient implementation of the
-  //     NamingContext functionality, i.e., the state is not preserved
-  //     across process boundaries.  Derives from
-  //     TAO_Hash_Naming_Context and uses TAO_Transient_Bindings_Map to
-  //     store name to object bindings.
-
-public:
-
-  typedef TAO_Transient_Bindings_Map::HASH_MAP HASH_MAP;
-  // Underlying data structure - typedef for ease of use.
-
-  // = Initialization and termination methods.
-
-  TAO_Transient_Naming_Context (PortableServer::POA_ptr poa,
-                                const char *poa_id,
-                                size_t hash_table_size
-                                = ACE_DEFAULT_MAP_SIZE);
-  // Constructor.
-
-  virtual ~TAO_Transient_Naming_Context (void);
-  // Destructor.
-
-  // = Methods not implemented in TAO_Hash_Naming_Context.
-
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV);
-  // This operation returns a new naming context implemented by the
-  // same naming server in which the operation was invoked.  The
-  // context is not bound.
-
-  virtual void list (CORBA::ULong how_many,
-                     CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi,
-                     CORBA::Environment &ACE_TRY_ENV);
-  // Returns at most the requested number of bindings <how_many> in
-  // <bl>.  If the naming context contains additional bindings, they
-  // are returned with a BindingIterator.  In the naming context does
-  // not contain any additional bindings <bi> returned as null.
-
-protected:
-
-  ACE_UINT32 counter_;
-  // Counter used for generation of POA ids for children Naming
-  // Contexts.
-
-  TAO_Transient_Bindings_Map *transient_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.
-};
-
-#endif /* TAO_TRANSIENT_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 0c58e66beee..ec8ae6a5581 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -80,7 +80,7 @@ CosProperty_Hash_Value::~CosProperty_Hash_Value (void)
 {
 }
 
-//======================================================================
+// = The actual implementation methods.
 
 // Constructor.
 TAO_PropertySetFactory::TAO_PropertySetFactory (void)
@@ -99,7 +99,6 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
 
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySet.
   TAO_PropertySet *new_set;
@@ -119,8 +118,6 @@ CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
                                                         const CosPropertyService::Properties &allowed_properties,
                                                         CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::ConstraintNotSupported))
 {
   TAO_PropertySet *new_set = 0;
   CosPropertyService::PropertySet_ptr propset_ptr = 0;
@@ -130,8 +127,8 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
       // New a TAO_PropertySet using these constraints.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (allowed_property_types,
-                                       allowed_properties,
-                                       ACE_TRY_ENV),
+									    allowed_properties,
+									    ACE_TRY_ENV),
                       0);
       ACE_TRY_CHECK;
       
@@ -172,8 +169,6 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties,
                                                     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
 {
   TAO_PropertySet *new_set = 0;
   CosPropertyService::PropertySet_ptr propset_ptr = 0;
@@ -228,8 +223,6 @@ TAO_PropertySetDefFactory::~TAO_PropertySetDefFactory (void)
     delete this->propertysetdef_products_[pi];
 }
 
-//======================================================================
-
 // Constrctor.
 TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
 {
@@ -242,7 +235,6 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
 
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySetDef.
   TAO_PropertySetDef *new_set;
@@ -264,8 +256,6 @@ CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
                                                               const CosPropertyService::PropertyDefs &allowed_property_defs,
                                                               CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::ConstraintNotSupported))
 {
   TAO_PropertySetDef *new_set = 0;
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
@@ -317,8 +307,6 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs,
                                                           CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
 {
   TAO_PropertySetDef *new_set = 0;
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
@@ -363,7 +351,700 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
   return propsetdef_ptr;
 }
 
-//======================================================================
+// Makes default sized hash_table_.
+
+TAO_PropertySetDef::TAO_PropertySetDef (void)
+{
+}
+
+// Constructor that the factory uses.
+
+TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
+                                        const CosPropertyService::PropertyDefs allowed_property_defs,
+                                        CORBA::Environment &ACE_TRY_ENV)
+  : TAO_PropertySet(allowed_property_types,
+                    allowed_property_defs.length (),
+                    ACE_TRY_ENV)
+{
+  // Set the length of the allowed property names.
+  this->allowed_property_names_.length (allowed_property_defs.length ());
+
+  // Copy the allowed properties' names to the sequence.
+  for (size_t ni = 0; ni < allowed_property_defs.length (); ni++)
+    this->allowed_property_names_[ni] =
+      allowed_property_defs[ni].property_name;
+  
+  // Define the allowed properties in the hash table.
+  ACE_TRY
+    {
+      this->define_properties_with_modes (allowed_property_defs,
+                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_RETHROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+}
+
+// Constructor that the factory uses.
+
+TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs,
+                                        CORBA::Environment &ACE_TRY_ENV)
+{
+  this->define_properties_with_modes (initial_property_defs,
+                                      ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+// Destructor.
+
+TAO_PropertySetDef::~TAO_PropertySetDef (void)
+{
+}
+
+// Return the sequence that is there in side.
+void
+TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types,
+                                                CORBA::Environment &)
+{
+  // Copy contents of the sequence.
+  ACE_NEW (property_types,
+           CosPropertyService::PropertyTypes (this->allowed_property_types_));
+}
+
+void
+TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs,
+                                            CORBA::Environment &)
+{
+  // We have all the names, get the values and the modes from the Hash
+  // Table and return.
+
+  // Allocate memory.
+  ACE_NEW (property_defs,
+           CosPropertyService::PropertyDefs (this->allowed_property_names_.length ()));
+
+  // Get the modes and property values for all these property
+  // names. Some may not be there in the Hash Table, probably got
+  // deleted because of their modes were not safe.
+
+  // @@ TO DO.
+}
+
+// Check for name's validity. If name not there define it. If it is
+// there and if type is equal and if mode allows define it else raise
+// exception.
+void
+TAO_PropertySetDef::define_property_with_mode (const char *property_name,
+                                               const CORBA::Any &property_value,
+                                               CosPropertyService::PropertyModeType property_mode,
+                                               CORBA::Environment &ACE_TRY_ENV)
+{
+  // Check the names validity.
+  if (property_name == 0)
+    ACE_THROW (CosPropertyService::InvalidPropertyName());
+
+  // Is this type allowed?
+  if (is_type_allowed (property_value.type ()) != 1)
+    ACE_THROW (CosPropertyService::UnsupportedTypeCode());
+
+  // Is this property allowed?
+  if (is_property_allowed (property_name) != 1)
+    ACE_THROW (CosPropertyService::UnsupportedProperty());
+  
+  // Is this a valid mode.
+  if (property_mode == CosPropertyService::undefined)
+    ACE_THROW (CosPropertyService::UnsupportedMode());
+
+  // Try to bind the Property.
+  CosProperty_Hash_Key hash_key (property_name);
+  CosProperty_Hash_Value hash_value (property_value,
+                                     property_mode);
+  COSPROPERTY_HASH_ENTRY *entry_ptr;
+
+  
+  int ret = this->hash_table_.bind (hash_key, hash_value, entry_ptr);
+
+  //CosProperty_Hash_Value old_value;
+  //CosProperty_Hash_Key old_key;
+
+  switch (ret)
+    {
+    case 0:
+      break;
+    case 1:
+      // Property name exists.
+      
+      // Is the pointer valid.
+      if (entry_ptr == 0)
+        ACE_THROW (CORBA::UNKNOWN ());
+      
+      // If type is not the same, raise exception.
+      if (entry_ptr->int_id_.pvalue_.type () != property_value.type ())
+        ACE_THROW (CosPropertyService::ConflictingProperty());
+
+      // If mode is read only, raise exception.
+      if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
+          (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
+        ACE_THROW (CosPropertyService::ReadOnlyProperty());
+
+      // If current mode is fixed_normal, but the new mode is not
+      // fixed, reject it.
+      if ((entry_ptr->int_id_.pmode_ ==
+           CosPropertyService::fixed_normal) &&
+          (property_mode < CosPropertyService::fixed_normal))
+        ACE_THROW (CosPropertyService::UnsupportedMode());
+      
+      // Everything is fine. Overwrite the value.
+      if (this->hash_table_.rebind (hash_key,
+                                    hash_value) > 0)
+        {
+          break;
+        }
+    default:
+      // Error. ret is -1 or rebind returned other than 1.
+      ACE_THROW (CORBA::UNKNOWN ());
+    }
+
+  return;
+}
+
+// Define one by one. If any excceptions raised, build
+// MultipleExceptions sequence and raise that.
+void
+TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs,
+                                                  CORBA::Environment &ACE_TRY_ENV)
+{
+  // Get the length.
+  size_t sequence_length = property_defs.length ();
+
+  // Define multiple exceptions object.
+  CosPropertyService::MultipleExceptions multi_ex;
+
+  // Try defining the propdefs one by one.
+  for (size_t i = 0; i < sequence_length; i++)
+    {
+      ACE_TRY
+        {
+          // Define the property.
+          this->define_property_with_mode (property_defs[i].property_name,
+                                           property_defs[i].property_value,
+                                           property_defs[i].property_mode,
+                                           ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+        {
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::invalid_property_name;
+          multi_ex.exceptions[len].failing_property_name =
+            property_defs[i].property_name;
+        }
+      ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
+        {
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::conflicting_property;
+          multi_ex.exceptions[len].failing_property_name =
+            property_defs[i].property_name;
+        }
+      ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
+        {
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::read_only_property;
+          multi_ex.exceptions[len].failing_property_name =
+            property_defs[i].property_name;
+        }
+      ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
+        {
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::unsupported_type_code;
+          multi_ex.exceptions[len].failing_property_name =
+            property_defs[i].property_name;
+        }
+      ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
+         {
+           size_t len = multi_ex.exceptions.length ();
+           multi_ex.exceptions.length (len + 1);
+           multi_ex.exceptions[len].reason =
+             CosPropertyService::unsupported_property;
+           multi_ex.exceptions[len].failing_property_name =
+             property_defs[i].property_name;
+         }
+      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
+        {
+          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)
+        {
+          ACE_RETHROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK;
+    }
+
+  // Raise the multi exception if needed.
+  if (multi_ex.exceptions.length () > 0)
+    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+}
+
+// Get the mode of a property. Raises InvalidpropertyName,
+// PropertyNotFound exceptions.
+CosPropertyService::PropertyModeType
+TAO_PropertySetDef::get_property_mode (const char *property_name,
+                                       CORBA::Environment &ACE_TRY_ENV)
+{
+  // Check for the name's validity.
+  if (property_name == 0)
+    ACE_THROW_RETURN (CosPropertyService::InvalidPropertyName(),
+                      CosPropertyService::undefined);
+  
+  // Find the property in the hash table.
+  CosProperty_Hash_Key hash_key (property_name);
+  CosProperty_Hash_Value hash_value;
+
+  int ret = this->hash_table_.find (hash_key, hash_value);
+
+  switch (ret)
+    {
+    case 0:
+      // Property found.
+      return hash_value.pmode_;
+    default:
+      // Error or property is not found.
+      ACE_THROW_RETURN (CosPropertyService::PropertyNotFound(),
+                        CosPropertyService::undefined);
+    }
+}
+
+// Batch operation for getting the property. Invoke get_property_mode
+// for each name.
+// Return value False indicates that properties with *undefined* modes
+// have failed due to PropertyNotFound or InvalidPropertyName exception.
+// Returning False in case of *Nothing to retun* or New is
+// failing. The caller has  to check the out parameter whether it is
+// Nil or no, before doing something with it.
+CORBA::Boolean
+TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names,
+                                        CosPropertyService::PropertyModes_out property_modes,
+                                        CORBA::Environment &ACE_TRY_ENV)
+{
+  // Allocate memory for the out parameter.
+  ACE_NEW_RETURN (property_modes,
+                  CosPropertyService::PropertyModes,
+                  1);
+
+  // Validate the length of names sequence.
+  size_t sequence_length = property_names.length ();
+
+  if (sequence_length == 0)
+    return 1;
+
+  // Set the length of the sequence.
+  property_modes->length (sequence_length);
+
+  // Intialize thre return value.
+  CORBA::Boolean ret = 1;
+
+  // Invoking get_property_mode for each name.
+  CosPropertyService::PropertyModeType mode;
+  for (size_t i = 0; i < sequence_length; i++)
+    {
+      ACE_TRY
+        {
+          // Invoke get_property_mode for this name.
+          mode = this->get_property_mode (property_names[i],
+                                          ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          // Store the mode in the out sequence.
+          property_modes[i].property_name = property_names[i];
+          property_modes[i].property_mode = mode;
+        }
+      ACE_CATCHANY
+        {
+          // Return value becomes false.
+          ret = 1;
+
+          // Assign this property to the out parameter with undefined
+          // mode.
+          property_modes[i].property_name = property_names[i];
+          property_modes[i].property_mode = CosPropertyService::undefined;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+    }
+
+  return ret;
+}
+
+// Changing the mode of the property.
+// "Normal" to anything is possible.
+// "Readonly" mode to "Fixed-Readonly" is possible. Others not possible.
+// "Fixed-Normal" to "Fixed-Readonly" is possible. Other things are impossible.
+// "Fixed-Readonly" to anything is *not* possible.
+void
+TAO_PropertySetDef::set_property_mode (const char *property_name,
+                                       CosPropertyService::PropertyModeType property_mode,
+                                       CORBA::Environment &ACE_TRY_ENV)
+{
+  // Check the names validity.
+  if (property_name == 0)
+    ACE_THROW (CosPropertyService::InvalidPropertyName());
+
+  // Trying to set to undefined mode is not allowed.
+  if (property_mode == CosPropertyService::undefined)
+    ACE_THROW (CosPropertyService::UnsupportedMode());
+
+  // Find the property from the Hash Table.
+  CosProperty_Hash_Key hash_key (property_name);
+  CosProperty_Hash_Value hash_value;
+
+  int ret = this->hash_table_.find (hash_key, hash_value);
+  
+  //CosProperty_Hash_Value old_value;
+  //CosProperty_Hash_Key old_key;
+
+  // Act acc to the ret value.
+  switch (ret)
+    {
+    case 0:
+      // Property found.
+
+      // If the new mode  is the same as the old one, nothing to do.
+      if (hash_value.pmode_ == property_mode)
+        return;
+
+      // Check for legality of the mode change.
+      switch (hash_value.pmode_)
+        {
+        case CosPropertyService::normal:
+          // Set the new mode and update the hash table.
+          hash_value.pmode_ = property_mode;
+          if (this->hash_table_.rebind (hash_key,
+                                        hash_value) != 1)
+            // Return values 0 and -1 are not possible.
+            ACE_THROW (CORBA::UNKNOWN ());
+          break;
+          
+        case CosPropertyService::read_only:
+          // Read_only to fixed read only alone is possible.
+          if (property_mode != CosPropertyService::fixed_readonly)
+            ACE_THROW (CosPropertyService::UnsupportedMode());
+          else
+            {
+              // Change the mode and update hash table.
+              hash_value.pmode_ = property_mode;
+              if (this->hash_table_.rebind (hash_key,
+                                            hash_value) != 1)
+                // Return values 0 and -1 are not possible.
+                ACE_THROW (CORBA::UNKNOWN ());
+            }
+          break;
+
+        case CosPropertyService::fixed_normal:
+          // Fixed_normal to fixed_readonly alone is possible.
+          if (property_mode != CosPropertyService::fixed_readonly)
+            ACE_THROW (CosPropertyService::UnsupportedMode());
+          else
+            {
+              // Change the mode and update the hash table.
+              hash_value.pmode_ = property_mode;
+              if (this->hash_table_.rebind (hash_key,
+                                            hash_value) != 1)
+                // Return values 0 and -1 are not possible.
+                ACE_THROW (CORBA::UNKNOWN ());
+            }
+          break;
+
+        default:
+          // Fixed_readonly to any mode is not possible.
+          ACE_THROW (CosPropertyService::UnsupportedMode());
+        }
+      break;
+    case -1:
+    default:
+      // Error or property not found in the Hash Table.
+      ACE_THROW (CosPropertyService::PropertyNotFound());
+    }
+}
+
+// Batch operation for setting the property. Raises
+// MultipleExceptions.  Set the properties one by one, catch
+// exceptions if any and keep them as in the multiple exceptions
+// sequence and return.
+
+void
+TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes,
+                                        CORBA::Environment &ACE_TRY_ENV)
+{
+  // Get the length of the sequence.
+  size_t sequence_length = property_modes.length ();
+
+  // Multiple exception variable to keep track of exceptions.
+  CosPropertyService::MultipleExceptions multi_ex;
+
+  // Set  modes one by one.
+  for (size_t i = 0; i < sequence_length; i++)
+    {
+      ACE_TRY
+        {
+          this->set_property_mode (property_modes[i].property_name,
+                                   property_modes[i].property_mode,
+                                   ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
+        {
+          // Put this exception in the multiple exception.
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::property_not_found;
+          multi_ex.exceptions[len].failing_property_name =
+            property_modes[i].property_name;
+        }
+      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+        {
+          // Put this exception in the multiple exception.
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::invalid_property_name;
+          multi_ex.exceptions[len].failing_property_name =
+            property_modes[i].property_name;
+        }
+      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
+        {
+          // Put this exception in the multiple exception.
+          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_modes[i].property_name;
+        }
+      ACE_CATCH (CORBA::SystemException, systex)
+        {
+          ACE_RETHROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK;
+    }
+
+  // Raise the multi_ex, if needed.
+  if (multi_ex.exceptions.length () > 0)
+    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+}
+
+// Constructor. Construct the iterator from the PropertySet object.
+
+TAO_PropertyNamesIterator::TAO_PropertyNamesIterator (TAO_PropertySet &property_set)
+  : iterator_ (property_set.hash_table_)
+{
+}
+
+// Destructor.
+
+TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
+{
+}
+
+// Resets the position in an iterator to the first property name, if
+// one exists.
+
+void
+TAO_PropertyNamesIterator::reset (CORBA::Environment &)
+{
+  this->iterator_ = this->iterator_.map ().begin ();
+}
+
+// The next_one operation returns true if an item exists at the
+// current position in the iterator with an output parameter of a
+// property name. A return of false signifies no more items in the
+// iterator.
+
+CORBA::Boolean
+TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name,
+                                     CORBA::Environment &)
+{
+  COSPROPERTY_HASH_ENTRY *entry_ptr;
+
+  if (this->iterator_.next (entry_ptr) != 0)
+    {
+      property_name =
+        CORBA::string_dup (entry_ptr->ext_id_.pname_);
+      this->iterator_.advance ();
+      return 1;
+    }
+  else
+    return 0;
+}
+
+CORBA::Boolean
+TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
+                                   CosPropertyService::PropertyNames_out property_names,
+                                   CORBA::Environment &)
+{
+  // Allocate memory for the out parameter.
+  ACE_NEW_RETURN (property_names,
+                  CosPropertyService::PropertyNames,
+                  0);
+
+  COSPROPERTY_HASH_ENTRY *entry_ptr = 0;
+
+  if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
+    return 0;
+
+  size_t size = this->iterator_.map ().current_size ();
+  
+  size_t len = 0;
+  if (how_many <= size)
+    len = how_many;
+  else
+    len = size;
+  property_names->length (len);
+
+  for (size_t ni = 0;
+       ni < property_names->length ();
+       ni++, this->iterator_.advance ())
+    if (this->iterator_.next (entry_ptr) != 0)
+      property_names [ni] =
+        CORBA::string_dup (entry_ptr->ext_id_.pname_);
+
+  return 1;
+}
+
+void
+TAO_PropertyNamesIterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+{
+  // Remove self from POA.  Because of reference counting, the POA
+  // will automatically delete the servant when all pending requests
+  // on this servant are complete.
+  
+  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_PropertiesIterator::TAO_PropertiesIterator (TAO_PropertySet &property_set)
+  : iterator_ (property_set.hash_table_)
+{
+}
+
+TAO_PropertiesIterator::~TAO_PropertiesIterator (void)
+{
+}
+
+void
+TAO_PropertiesIterator::reset (CORBA::Environment &)
+{
+  this->iterator_ = this->iterator_.map ().begin ();
+}
+
+CORBA::Boolean
+TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty,
+                                  CORBA::Environment &)
+{
+  COSPROPERTY_HASH_ENTRY *entry_ptr;
+  
+  if (this->iterator_.next (entry_ptr) != 0)
+    {
+      aproperty = new CosPropertyService::Property;
+      aproperty->property_name = entry_ptr->ext_id_.pname_;
+      aproperty->property_value = entry_ptr->int_id_.pvalue_;
+      this->iterator_.advance ();
+      return 1;
+    }
+  else
+    {
+      aproperty = new CosPropertyService::Property;
+      return 0;
+    }
+}
+
+CORBA::Boolean
+TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
+                                CosPropertyService::Properties_out nproperties,
+                                CORBA::Environment &)
+{
+  // Allocate memory for the out parameter.
+  ACE_NEW_RETURN (nproperties,
+                  CosPropertyService::Properties,
+                  0);
+
+  COSPROPERTY_HASH_ENTRY *entry_ptr = 0;
+
+  if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
+    return 0;
+
+  size_t size = this->iterator_.map ().current_size ();
+
+  size_t len;
+  if (how_many <= size)
+    len = how_many;
+  else
+    len = size;
+  nproperties->length (len);
+
+  for (size_t ni = 0;
+       ni < nproperties->length ();
+       ni++,
+         this->iterator_.advance ())
+    {
+      if (this->iterator_.next (entry_ptr) != 0)
+        {
+          nproperties [ni].property_name = entry_ptr->ext_id_.pname_;
+          nproperties [ni].property_value =
+            entry_ptr->int_id_.pvalue_;
+        }
+      else
+        break;
+    }
+  
+  return 1;
+}
+
+void
+TAO_PropertiesIterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+{
+  // Remove self from POA.  Because of reference counting, the POA
+  // will automatically delete the servant when all pending requests
+  // on this servant are complete.
+
+  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;
+}
 
 // Makes default sized hash_table_. All the sequences are set the max
 // length as 0.
@@ -425,7 +1106,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
 
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA::Environment &ACE_TRY_ENV)
 {
   // Define all the initial properties in the Property Set. All take
   // *normal* modes.
@@ -460,14 +1141,8 @@ TAO_PropertySet::~TAO_PropertySet (void)
 
 void
 TAO_PropertySet::define_property (const char *property_name,
-                                  const CORBA::Any &property_value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::InvalidPropertyName,
-                   CosPropertyService::ConflictingProperty,
-                   CosPropertyService::UnsupportedTypeCode,
-                   CosPropertyService::UnsupportedProperty,
-                   CosPropertyService::ReadOnlyProperty))
+                                      const CORBA::Any &property_value,
+                                      CORBA::Environment &ACE_TRY_ENV)
 {
   // Check the name's validity.
   if (property_name == 0)
@@ -601,9 +1276,7 @@ TAO_PropertySet::is_property_allowed (const char* property_name)
 
 void
 TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties,
-                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
+                                        CORBA::Environment &ACE_TRY_ENV)
 {
   // Get the length.
   size_t sequence_length = nproperties.length ();
@@ -685,7 +1358,6 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
 
 CORBA::ULong
 TAO_PropertySet::get_number_of_properties (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->hash_table_.current_size ();
 }
@@ -701,7 +1373,6 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
                                              CosPropertyService::PropertyNames_out property_names,
                                              CosPropertyService::PropertyNamesIterator_out rest,
                                              CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocating storage is a must.
   ACE_NEW (property_names,
@@ -785,10 +1456,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
 
 CORBA::Any *
 TAO_PropertySet::get_property_value (const char *property_name,
-                                     CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::PropertyNotFound,
-                   CosPropertyService::InvalidPropertyName))
+                                         CORBA::Environment &ACE_TRY_ENV)
 {
   // Check the name's validity.
   if (property_name == 0)
@@ -821,9 +1489,8 @@ TAO_PropertySet::get_property_value (const char *property_name,
 
 CORBA::Boolean
 TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names,
-                                 CosPropertyService::Properties_out nproperties,
-                                 CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                                     CosPropertyService::Properties_out nproperties,
+                                     CORBA::Environment &ACE_TRY_ENV)
 {
   // Allocate memory for the out parameter.
   ACE_NEW_RETURN (nproperties,
@@ -885,7 +1552,6 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
                                          CosPropertyService::Properties_out nproperties,
                                          CosPropertyService::PropertiesIterator_out rest,
                                          CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
   ACE_NEW (nproperties,
@@ -978,11 +1644,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
 void
 TAO_PropertySet::delete_property (const char *property_name,
-                                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::PropertyNotFound,
-                   CosPropertyService::InvalidPropertyName,
-                   CosPropertyService::FixedProperty))
+                                      CORBA::Environment &ACE_TRY_ENV)
 {
   // Check the name's validity.
   if (property_name == 0)
@@ -1020,9 +1682,7 @@ TAO_PropertySet::delete_property (const char *property_name,
 
 void
 TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names,
-                                    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
+                                        CORBA::Environment &ACE_TRY_ENV)
 {
   // Get the length.
   size_t sequence_length = property_names.length ();
@@ -1091,7 +1751,6 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
 
 CORBA::Boolean
 TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get all the property names in a names' sequence.
   CosPropertyService::PropertyNames_ptr names_ptr = 0;
@@ -1129,9 +1788,7 @@ TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV)
 
 CORBA::Boolean
 TAO_PropertySet::is_property_defined (const char *property_name,
-                                      CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::InvalidPropertyName))
+                                          CORBA::Environment &)
 {
   CosProperty_Hash_Key hash_key (property_name);
   
@@ -1148,735 +1805,6 @@ TAO_PropertySet::operator= (const TAO_PropertySet &)
   // Empty.
 }
 
-//======================================================================
-
-// Makes default sized hash_table_.
-
-TAO_PropertySetDef::TAO_PropertySetDef (void)
-{
-}
-
-// Constructor that the factory uses.
-
-TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
-                                        const CosPropertyService::PropertyDefs allowed_property_defs,
-                                        CORBA::Environment &ACE_TRY_ENV)
-  : TAO_PropertySet(allowed_property_types,
-                    allowed_property_defs.length (),
-                    ACE_TRY_ENV)
-{
-  // Set the length of the allowed property names.
-  this->allowed_property_names_.length (allowed_property_defs.length ());
-
-  // Copy the allowed properties' names to the sequence.
-  for (size_t ni = 0; ni < allowed_property_defs.length (); ni++)
-    this->allowed_property_names_[ni] =
-      allowed_property_defs[ni].property_name;
-  
-  // Define the allowed properties in the hash table.
-  ACE_TRY
-    {
-      this->define_properties_with_modes (allowed_property_defs,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// Constructor that the factory uses.
-
-TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs,
-                                        CORBA::Environment &ACE_TRY_ENV)
-{
-  this->define_properties_with_modes (initial_property_defs,
-                                      ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-// Destructor.
-
-TAO_PropertySetDef::~TAO_PropertySetDef (void)
-{
-}
-
-// Return the sequence that is there in side.
-void
-TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types,
-                                                CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Copy contents of the sequence.
-  ACE_NEW (property_types,
-           CosPropertyService::PropertyTypes (this->allowed_property_types_));
-}
-
-void
-TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs,
-                                            CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // We have all the names, get the values and the modes from the Hash
-  // Table and return.
-
-  // Allocate memory.
-  ACE_NEW (property_defs,
-           CosPropertyService::PropertyDefs (this->allowed_property_names_.length ()));
-
-  // Get the modes and property values for all these property
-  // names. Some may not be there in the Hash Table, probably got
-  // deleted because of their modes were not safe.
-
-  // @@ TO DO.
-}
-
-// Check for name's validity. If name not there define it. If it is
-// there and if type is equal and if mode allows define it else raise
-// exception.
-void
-TAO_PropertySetDef::define_property_with_mode (const char *property_name,
-                                               const CORBA::Any &property_value,
-                                               CosPropertyService::PropertyModeType property_mode,
-                                               CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::InvalidPropertyName,
-                   CosPropertyService::ConflictingProperty,
-                   CosPropertyService::UnsupportedTypeCode,
-                   CosPropertyService::UnsupportedProperty,
-                   CosPropertyService::UnsupportedMode,
-                   CosPropertyService::ReadOnlyProperty))
-{
-  // Check the names validity.
-  if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
-
-  // Is this type allowed?
-  if (is_type_allowed (property_value.type ()) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedTypeCode());
-
-  // Is this property allowed?
-  if (is_property_allowed (property_name) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedProperty());
-  
-  // Is this a valid mode.
-  if (property_mode == CosPropertyService::undefined)
-    ACE_THROW (CosPropertyService::UnsupportedMode());
-
-  // Try to bind the Property.
-  CosProperty_Hash_Key hash_key (property_name);
-  CosProperty_Hash_Value hash_value (property_value,
-                                     property_mode);
-  COSPROPERTY_HASH_ENTRY *entry_ptr;
-
-  
-  int ret = this->hash_table_.bind (hash_key, hash_value, entry_ptr);
-
-  //CosProperty_Hash_Value old_value;
-  //CosProperty_Hash_Key old_key;
-
-  switch (ret)
-    {
-    case 0:
-      break;
-    case 1:
-      // Property name exists.
-      
-      // Is the pointer valid.
-      if (entry_ptr == 0)
-        ACE_THROW (CORBA::UNKNOWN ());
-      
-      // If type is not the same, raise exception.
-      if (entry_ptr->int_id_.pvalue_.type () != property_value.type ())
-        ACE_THROW (CosPropertyService::ConflictingProperty());
-
-      // If mode is read only, raise exception.
-      if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
-          (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-        ACE_THROW (CosPropertyService::ReadOnlyProperty());
-
-      // If current mode is fixed_normal, but the new mode is not
-      // fixed, reject it.
-      if ((entry_ptr->int_id_.pmode_ ==
-           CosPropertyService::fixed_normal) &&
-          (property_mode < CosPropertyService::fixed_normal))
-        ACE_THROW (CosPropertyService::UnsupportedMode());
-      
-      // Everything is fine. Overwrite the value.
-      if (this->hash_table_.rebind (hash_key,
-                                    hash_value) > 0)
-        {
-          break;
-        }
-    default:
-      // Error. ret is -1 or rebind returned other than 1.
-      ACE_THROW (CORBA::UNKNOWN ());
-    }
-
-  return;
-}
-
-// Define one by one. If any excceptions raised, build
-// MultipleExceptions sequence and raise that.
-void
-TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs,
-                                                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
-{
-  // Get the length.
-  size_t sequence_length = property_defs.length ();
-
-  // Define multiple exceptions object.
-  CosPropertyService::MultipleExceptions multi_ex;
-
-  // Try defining the propdefs one by one.
-  for (size_t i = 0; i < sequence_length; i++)
-    {
-      ACE_TRY
-        {
-          // Define the property.
-          this->define_property_with_mode (property_defs[i].property_name,
-                                           property_defs[i].property_value,
-                                           property_defs[i].property_mode,
-                                           ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
-        {
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::invalid_property_name;
-          multi_ex.exceptions[len].failing_property_name =
-            property_defs[i].property_name;
-        }
-      ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
-        {
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::conflicting_property;
-          multi_ex.exceptions[len].failing_property_name =
-            property_defs[i].property_name;
-        }
-      ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
-        {
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::read_only_property;
-          multi_ex.exceptions[len].failing_property_name =
-            property_defs[i].property_name;
-        }
-      ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
-        {
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::unsupported_type_code;
-          multi_ex.exceptions[len].failing_property_name =
-            property_defs[i].property_name;
-        }
-      ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
-         {
-           size_t len = multi_ex.exceptions.length ();
-           multi_ex.exceptions.length (len + 1);
-           multi_ex.exceptions[len].reason =
-             CosPropertyService::unsupported_property;
-           multi_ex.exceptions[len].failing_property_name =
-             property_defs[i].property_name;
-         }
-      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
-        {
-          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)
-        {
-          ACE_RETHROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-
-  // Raise the multi exception if needed.
-  if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
-}
-
-// Get the mode of a property. Raises InvalidpropertyName,
-// PropertyNotFound exceptions.
-CosPropertyService::PropertyModeType
-TAO_PropertySetDef::get_property_mode (const char *property_name,
-                                       CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::PropertyNotFound,
-                   CosPropertyService::InvalidPropertyName))
-{
-  // Check for the name's validity.
-  if (property_name == 0)
-    ACE_THROW_RETURN (CosPropertyService::InvalidPropertyName(),
-                      CosPropertyService::undefined);
-  
-  // Find the property in the hash table.
-  CosProperty_Hash_Key hash_key (property_name);
-  CosProperty_Hash_Value hash_value;
-
-  int ret = this->hash_table_.find (hash_key, hash_value);
-
-  switch (ret)
-    {
-    case 0:
-      // Property found.
-      return hash_value.pmode_;
-    default:
-      // Error or property is not found.
-      ACE_THROW_RETURN (CosPropertyService::PropertyNotFound(),
-                        CosPropertyService::undefined);
-    }
-}
-
-// Batch operation for getting the property. Invoke get_property_mode
-// for each name.
-// Return value False indicates that properties with *undefined* modes
-// have failed due to PropertyNotFound or InvalidPropertyName exception.
-// Returning False in case of *Nothing to retun* or New is
-// failing. The caller has  to check the out parameter whether it is
-// Nil or no, before doing something with it.
-CORBA::Boolean
-TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                        CosPropertyService::PropertyModes_out property_modes,
-                                        CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Allocate memory for the out parameter.
-  ACE_NEW_RETURN (property_modes,
-                  CosPropertyService::PropertyModes,
-                  1);
-
-  // Validate the length of names sequence.
-  size_t sequence_length = property_names.length ();
-
-  if (sequence_length == 0)
-    return 1;
-
-  // Set the length of the sequence.
-  property_modes->length (sequence_length);
-
-  // Intialize thre return value.
-  CORBA::Boolean ret = 1;
-
-  // Invoking get_property_mode for each name.
-  CosPropertyService::PropertyModeType mode;
-  for (size_t i = 0; i < sequence_length; i++)
-    {
-      ACE_TRY
-        {
-          // Invoke get_property_mode for this name.
-          mode = this->get_property_mode (property_names[i],
-                                          ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // Store the mode in the out sequence.
-          property_modes[i].property_name = property_names[i];
-          property_modes[i].property_mode = mode;
-        }
-      ACE_CATCHANY
-        {
-          // Return value becomes false.
-          ret = 1;
-
-          // Assign this property to the out parameter with undefined
-          // mode.
-          property_modes[i].property_name = property_names[i];
-          property_modes[i].property_mode = CosPropertyService::undefined;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-    }
-
-  return ret;
-}
-
-// Changing the mode of the property.
-// "Normal" to anything is possible.
-// "Readonly" mode to "Fixed-Readonly" is possible. Others not possible.
-// "Fixed-Normal" to "Fixed-Readonly" is possible. Other things are impossible.
-// "Fixed-Readonly" to anything is *not* possible.
-void
-TAO_PropertySetDef::set_property_mode (const char *property_name,
-                                       CosPropertyService::PropertyModeType property_mode,
-                                       CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::InvalidPropertyName,
-                   CosPropertyService::PropertyNotFound,
-                   CosPropertyService::UnsupportedMode))
-{
-  // Check the names validity.
-  if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
-
-  // Trying to set to undefined mode is not allowed.
-  if (property_mode == CosPropertyService::undefined)
-    ACE_THROW (CosPropertyService::UnsupportedMode());
-
-  // Find the property from the Hash Table.
-  CosProperty_Hash_Key hash_key (property_name);
-  CosProperty_Hash_Value hash_value;
-
-  int ret = this->hash_table_.find (hash_key, hash_value);
-  
-  //CosProperty_Hash_Value old_value;
-  //CosProperty_Hash_Key old_key;
-
-  // Act acc to the ret value.
-  switch (ret)
-    {
-    case 0:
-      // Property found.
-
-      // If the new mode  is the same as the old one, nothing to do.
-      if (hash_value.pmode_ == property_mode)
-        return;
-
-      // Check for legality of the mode change.
-      switch (hash_value.pmode_)
-        {
-        case CosPropertyService::normal:
-          // Set the new mode and update the hash table.
-          hash_value.pmode_ = property_mode;
-          if (this->hash_table_.rebind (hash_key,
-                                        hash_value) != 1)
-            // Return values 0 and -1 are not possible.
-            ACE_THROW (CORBA::UNKNOWN ());
-          break;
-          
-        case CosPropertyService::read_only:
-          // Read_only to fixed read only alone is possible.
-          if (property_mode != CosPropertyService::fixed_readonly)
-            ACE_THROW (CosPropertyService::UnsupportedMode());
-          else
-            {
-              // Change the mode and update hash table.
-              hash_value.pmode_ = property_mode;
-              if (this->hash_table_.rebind (hash_key,
-                                            hash_value) != 1)
-                // Return values 0 and -1 are not possible.
-                ACE_THROW (CORBA::UNKNOWN ());
-            }
-          break;
-
-        case CosPropertyService::fixed_normal:
-          // Fixed_normal to fixed_readonly alone is possible.
-          if (property_mode != CosPropertyService::fixed_readonly)
-            ACE_THROW (CosPropertyService::UnsupportedMode());
-          else
-            {
-              // Change the mode and update the hash table.
-              hash_value.pmode_ = property_mode;
-              if (this->hash_table_.rebind (hash_key,
-                                            hash_value) != 1)
-                // Return values 0 and -1 are not possible.
-                ACE_THROW (CORBA::UNKNOWN ());
-            }
-          break;
-
-        default:
-          // Fixed_readonly to any mode is not possible.
-          ACE_THROW (CosPropertyService::UnsupportedMode());
-        }
-      break;
-    case -1:
-    default:
-      // Error or property not found in the Hash Table.
-      ACE_THROW (CosPropertyService::PropertyNotFound());
-    }
-}
-
-// Batch operation for setting the property. Raises
-// MultipleExceptions.  Set the properties one by one, catch
-// exceptions if any and keep them as in the multiple exceptions
-// sequence and return.
-
-void
-TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes,
-                                        CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions))
-{
-  // Get the length of the sequence.
-  size_t sequence_length = property_modes.length ();
-
-  // Multiple exception variable to keep track of exceptions.
-  CosPropertyService::MultipleExceptions multi_ex;
-
-  // Set  modes one by one.
-  for (size_t i = 0; i < sequence_length; i++)
-    {
-      ACE_TRY
-        {
-          this->set_property_mode (property_modes[i].property_name,
-                                   property_modes[i].property_mode,
-                                   ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
-        {
-          // Put this exception in the multiple exception.
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::property_not_found;
-          multi_ex.exceptions[len].failing_property_name =
-            property_modes[i].property_name;
-        }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
-        {
-          // Put this exception in the multiple exception.
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::invalid_property_name;
-          multi_ex.exceptions[len].failing_property_name =
-            property_modes[i].property_name;
-        }
-      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
-        {
-          // Put this exception in the multiple exception.
-          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_modes[i].property_name;
-        }
-      ACE_CATCH (CORBA::SystemException, systex)
-        {
-          ACE_RETHROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-
-  // Raise the multi_ex, if needed.
-  if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
-}
-
-//======================================================================
-
-// Constructor. Construct the iterator from the PropertySet object.
-
-TAO_PropertyNamesIterator::TAO_PropertyNamesIterator (TAO_PropertySet &property_set)
-  : iterator_ (property_set.hash_table_)
-{
-}
-
-// Destructor.
-
-TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
-{
-}
-
-// Resets the position in an iterator to the first property name, if
-// one exists.
-
-void
-TAO_PropertyNamesIterator::reset (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->iterator_ = this->iterator_.map ().begin ();
-}
-
-// The next_one operation returns true if an item exists at the
-// current position in the iterator with an output parameter of a
-// property name. A return of false signifies no more items in the
-// iterator.
-
-CORBA::Boolean
-TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name,
-                                     CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  COSPROPERTY_HASH_ENTRY *entry_ptr;
-
-  if (this->iterator_.next (entry_ptr) != 0)
-    {
-      property_name =
-        CORBA::string_dup (entry_ptr->ext_id_.pname_);
-      this->iterator_.advance ();
-      return 1;
-    }
-  else
-    return 0;
-}
-
-CORBA::Boolean
-TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
-                                   CosPropertyService::PropertyNames_out property_names,
-                                   CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Allocate memory for the out parameter.
-  ACE_NEW_RETURN (property_names,
-                  CosPropertyService::PropertyNames,
-                  0);
-
-  COSPROPERTY_HASH_ENTRY *entry_ptr = 0;
-
-  if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
-    return 0;
-
-  size_t size = this->iterator_.map ().current_size ();
-  
-  size_t len = 0;
-  if (how_many <= size)
-    len = how_many;
-  else
-    len = size;
-  property_names->length (len);
-
-  for (size_t ni = 0;
-       ni < property_names->length ();
-       ni++, this->iterator_.advance ())
-    if (this->iterator_.next (entry_ptr) != 0)
-      property_names [ni] =
-        CORBA::string_dup (entry_ptr->ext_id_.pname_);
-
-  return 1;
-}
-
-void
-TAO_PropertyNamesIterator::destroy (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  
-  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_PropertiesIterator::TAO_PropertiesIterator (TAO_PropertySet &property_set)
-  : iterator_ (property_set.hash_table_)
-{
-}
-
-TAO_PropertiesIterator::~TAO_PropertiesIterator (void)
-{
-}
-
-void
-TAO_PropertiesIterator::reset (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->iterator_ = this->iterator_.map ().begin ();
-}
-
-CORBA::Boolean
-TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty,
-                                  CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  COSPROPERTY_HASH_ENTRY *entry_ptr;
-  
-  if (this->iterator_.next (entry_ptr) != 0)
-    {
-      aproperty = new CosPropertyService::Property;
-      aproperty->property_name = entry_ptr->ext_id_.pname_;
-      aproperty->property_value = entry_ptr->int_id_.pvalue_;
-      this->iterator_.advance ();
-      return 1;
-    }
-  else
-    {
-      aproperty = new CosPropertyService::Property;
-      return 0;
-    }
-}
-
-CORBA::Boolean
-TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
-                                CosPropertyService::Properties_out nproperties,
-                                CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Allocate memory for the out parameter.
-  ACE_NEW_RETURN (nproperties,
-                  CosPropertyService::Properties,
-                  0);
-
-  COSPROPERTY_HASH_ENTRY *entry_ptr = 0;
-
-  if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
-    return 0;
-
-  size_t size = this->iterator_.map ().current_size ();
-
-  size_t len;
-  if (how_many <= size)
-    len = how_many;
-  else
-    len = size;
-  nproperties->length (len);
-
-  for (size_t ni = 0;
-       ni < nproperties->length ();
-       ni++,
-         this->iterator_.advance ())
-    {
-      if (this->iterator_.next (entry_ptr) != 0)
-        {
-          nproperties [ni].property_name = entry_ptr->ext_id_.pname_;
-          nproperties [ni].property_value =
-            entry_ptr->int_id_.pvalue_;
-        }
-      else
-        break;
-    }
-  
-  return 1;
-}
-
-void
-TAO_PropertiesIterator::destroy (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-
-  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;
-}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>;
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 22971f2ef4a..7e4c73939e8 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -99,112 +99,6 @@ public:
   // Property Mode.
 };
 
-// ============================================================================
-
-// Forward declaration.
-class TAO_PropertySet;
-
-// ============================================================================
-
-class TAO_ORBSVCS_Export TAO_PropertySetFactory :  public virtual POA_CosPropertyService::PropertySetFactory
-{
-  // = TITLE
-  //     Factory class for the TAO_PropertySet class objects.
-  //
-  // = DESCRIPTION
-  //     The object may be created with some predfined properties.
-public:
-  // = Initialization and termination methods.
-
-  TAO_PropertySetFactory (void);
-  // Constructor.
-
-  virtual ~TAO_PropertySetFactory (void);
-  // Destructor.
-
-  virtual CosPropertyService::PropertySet_ptr
-  create_propertyset (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Returns a  new TAO_PropertySet object. "The property set returned
-  // will *not* have any initial properties."
-
-  virtual CosPropertyService::PropertySet_ptr
-  create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                  const CosPropertyService::Properties &allowed_properties,
-                                  CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::ConstraintNotSupported));
-    // Allows a client to create a new TAO_PropertySet with specific
-    // constraints. "All the properties will have *fixed-normal* modes".
-
-  virtual CosPropertyService::PropertySet_ptr
-  create_initial_propertyset (const CosPropertyService::Properties &initial_properties,
-                              CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
-  // Allows a client to create a new TAO_PropertySet with specific
-  // initial properties."All the properties will have *fixed-normal"
-  // modes".
-
-private:
-  TAO_Unbounded_Sequence<TAO_PropertySet*> propertyset_products_;
-  // The PropertySet objects new'ed and given to the client. Let us
-  // keep track all of them so that we can delete them at the end.
-};
-
-// ============================================================================
-
-// Forward declaration.
-class TAO_PropertySetDef;
-
-// ============================================================================
-
-class TAO_ORBSVCS_Export TAO_PropertySetDefFactory : public virtual POA_CosPropertyService::PropertySetDefFactory
-{
-  // = TITLE
-  //     Factory class for the TAO_PropertySetDef objects.
-  //
-  // = DESCRIPTION
-  //     The object creation may be done with some predefined properties.
-public:
-  // = Initialization and termination methods.
-
-  TAO_PropertySetDefFactory(void);
-  // Constructor.
-
-  virtual ~TAO_PropertySetDefFactory (void);
-  // Destructor.
-
-  virtual CosPropertyService::PropertySetDef_ptr
-  create_propertysetdef (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Returns a new TAO_PropertySetDef object.
-
-  virtual CosPropertyService::PropertySetDef_ptr
-  create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                     const CosPropertyService::PropertyDefs &allowed_property_defs,
-                                     CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::ConstraintNotSupported));
-  // Allows a client to create a new TAO_PropertySetDef with specific
-  // constraints.
-
-  virtual CosPropertyService::PropertySetDef_ptr
-  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs,
-                                 CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
-  // Allows a client to create a new TAO_PropertySetDef with specific
-  // initial properties.
-
-private:
-  TAO_Unbounded_Sequence<TAO_PropertySetDef*> propertysetdef_products_;
-  // The PropertySet objects new'ed and given to the client. Let us
-  // keep track all of them so that we can delete them at the end.
-};
-
-// ============================================================================
-
 class TAO_ORBSVCS_Export TAO_PropertySet :  public virtual POA_CosPropertyService::PropertySet
 {
   // = TITLE
@@ -241,80 +135,55 @@ public:
 
   virtual void define_property (const char *property_name,
                                 const CORBA::Any &property_value,
-                                CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::InvalidPropertyName,
-                     CosPropertyService::ConflictingProperty,
-                     CosPropertyService::UnsupportedTypeCode,
-                     CosPropertyService::UnsupportedProperty,
-                     CosPropertyService::ReadOnlyProperty));
-  
+                                CORBA::Environment &env);
   // Store the property in the hash after checking for validity of the
   // property name, duplicate name, type code over writing etc.
 
   virtual void define_properties (const CosPropertyService::Properties &nproperties,
-                                  CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+                                  CORBA::Environment &env);
   // Define a sequence of properties at a time.
 
-  virtual CORBA::ULong get_number_of_properties (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::ULong get_number_of_properties (CORBA::Environment &env);
   // Get the number of properties that are currently defined in the
   // PropertySet.
 
   virtual void get_all_property_names (CORBA::ULong how_many,
                                        CosPropertyService::PropertyNames_out property_names,
                                        CosPropertyService::PropertyNamesIterator_out rest,
-                                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       CORBA::Environment &env);
   // Get the names of all the properties that are currently defined in
   // the property set.
 
   virtual CORBA::Any *get_property_value (const char *property_name,
-                                          CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::PropertyNotFound,
-                     CosPropertyService::InvalidPropertyName));
+                                          CORBA::Environment &env);
   // Get the value of the property, given the name.
 
   virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
                                          CosPropertyService::Properties_out nproperties,
-                                         CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                         CORBA::Environment &env);
   // Get all names and their property values.
 
   virtual void get_all_properties (CORBA::ULong how_many,
                                    CosPropertyService::Properties_out nproperties,
                                    CosPropertyService::PropertiesIterator_out rest,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // Returns all of the property names currently defined in the
   // PropertySet. If the PropertySet contains more than how_many
   // property names, then the remaining property names are put into the PropertyNamesIterator.
 
   virtual void delete_property (const char *property_name,
-                                CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::PropertyNotFound,
-                     CosPropertyService::InvalidPropertyName,
-                     CosPropertyService::FixedProperty));
+                                CORBA::Environment &env);
   // Delete a property given a name.
 
   virtual void delete_properties (const CosPropertyService::PropertyNames &property_names,
-                                  CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+                                  CORBA::Environment &env);
   // Delete all the these properties from this property set.
 
-  virtual CORBA::Boolean delete_all_properties (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Boolean delete_all_properties (CORBA::Environment &env);
   // Delete everything from this property set.
 
   virtual CORBA::Boolean is_property_defined (const char *property_name,
-                                              CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::InvalidPropertyName));
+                                              CORBA::Environment &env);
   // Tell whether this property is defined or no. Forget about the
   // value.
 
@@ -356,7 +225,61 @@ protected:
   // can be defined.
 };
 
-// ============================================================================
+class TAO_ORBSVCS_Export TAO_PropertyNamesIterator : public virtual PortableServer::RefCountServantBase,
+                                                     public virtual POA_CosPropertyService::PropertyNamesIterator
+{
+  // = TITLE
+  //     The PropertyNamesIterator interface allows a client to
+  //     iterate through the names using the next_one or next_n operations.
+  //
+  // = DESCRIPTION
+  //     A PropertySet maintains a set of name-value pairs. The
+  //     get_all_property_names operation returns a sequence of names
+  //     (PropertyNames). If there are additional names, the
+  //     get_all_property_names operation returns an object supporting
+  //     the PropertyNamesIterator interface with the additional names.
+public:
+  // = Initialization and termination methods.
+  TAO_PropertyNamesIterator (TAO_PropertySet &property_set);
+  // Constructor.
+
+  virtual ~TAO_PropertyNamesIterator (void);
+  // Destructor.
+
+  virtual void reset (CORBA::Environment &env);
+  // The reset operation resets the position in an iterator to the
+  // first property name, if one exists.
+
+  virtual CORBA::Boolean next_one (CORBA::String_out property_name,
+                                   CORBA::Environment &env);
+  // The next_one operation returns true if an item exists at the
+  // current position in the iterator with an output parameter of a
+  // property name. A return of false signifies no more items in the iterator.
+
+
+  virtual CORBA::Boolean next_n (CORBA::ULong how_many,
+                                 CosPropertyService::PropertyNames_out property_names,
+                                 CORBA::Environment &env);
+  // The next_n operation returns true if an item exists at the
+  // current position in the iterator and the how_many parameter was
+  // set greater than zero. The output is a PropertyNames sequence
+  // with at most the how_many number of names. A return of false
+  // signifies no more items in the iterator.
+
+  virtual void destroy (CORBA::Environment &env);
+  // Destroys the iterator.
+private:
+  typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
+          COSPROPERTY_HASH_MAP;
+  typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
+          COSPROPERTY_HASH_ITERATOR;
+  typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
+          COSPROPERTY_HASH_ENTRY;
+
+  COSPROPERTY_HASH_ITERATOR iterator_;
+  // The Iterator object.
+};
+
 
 class TAO_ORBSVCS_Export TAO_PropertySetDef : public virtual POA_CosPropertyService::PropertySetDef,
                                               public virtual TAO_PropertySet
@@ -390,8 +313,7 @@ public:
   // Destructor.
 
   virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types,
-                                           CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                           CORBA::Environment &env);
   // Indicates which types of properties are supported by this
   // PropertySet. If the output sequence is empty, then there is no
   // restrictions on the any TypeCode portion of the property_value
@@ -399,9 +321,7 @@ public:
   // get_allowed_properties output sequence is not empty.
 
   virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs,
-                                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
+                                       CORBA::Environment &env);
   // Indicates which properties are supported by this PropertySet. If
   // the output sequence is empty, then there is no restrictions on
   // the properties that can be in this PropertySet, unless the
@@ -410,14 +330,7 @@ public:
   virtual void define_property_with_mode (const char *property_name,
                                           const CORBA::Any &property_value,
                                           CosPropertyService::PropertyModeType property_mode,
-                                          CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::InvalidPropertyName,
-                     CosPropertyService::ConflictingProperty,
-                     CosPropertyService::UnsupportedTypeCode,
-                     CosPropertyService::UnsupportedProperty,
-                     CosPropertyService::UnsupportedMode,
-                     CosPropertyService::ReadOnlyProperty));
+                                          CORBA::Environment &env);
   // This operation will modify or add a property to the
   // PropertySet. If the property already exists, then the property
   // type is checked before the value is overwritten. The property
@@ -427,24 +340,18 @@ public:
   // exception is thrown.
 
   virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs,
-                                             CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+                                             CORBA::Environment &env);
   // This operation will modify or add each of the properties in the
   // Properties parameter to the PropertySet.
 
   virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name,
-                                                                  CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::PropertyNotFound,
-                     CosPropertyService::InvalidPropertyName));
+                                                                  CORBA::Environment &env);
   // Get the mode of a property. Raises InvalidpropertyName,
   // PropertyNotFound exceptions.
 
   virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names,
                                              CosPropertyService::PropertyModes_out property_modes,
-                                             CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                             CORBA::Environment &env);
   // Batch operation for getting the property. Invoke
   // get_property_mode for each name.  Return value False indicates
   // that properties with *undefined* modes have failed due to
@@ -455,11 +362,7 @@ public:
 
   virtual void set_property_mode (const char *property_name,
                                   CosPropertyService::PropertyModeType property_mode,
-                                  CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::InvalidPropertyName,
-                     CosPropertyService::PropertyNotFound,
-                     CosPropertyService::UnsupportedMode));
+                                  CORBA::Environment &env);
   // Set the mode of a property. Watch the following. The change of
   // mode is allowed introduce more constraints, but it should not
   // relax the constraints. The following decisions have been made, in
@@ -472,75 +375,89 @@ public:
   // raised.
 
   virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosPropertyService::MultipleExceptions));
+                                   CORBA::Environment &env);
   // Batch operation for setting the property. Raises
   // MultipleExceptions.
 };
 
-// ============================================================================
-
-class TAO_ORBSVCS_Export TAO_PropertyNamesIterator : public virtual PortableServer::RefCountServantBase,
-                                                     public virtual POA_CosPropertyService::PropertyNamesIterator
+class TAO_ORBSVCS_Export TAO_PropertySetFactory :  public virtual POA_CosPropertyService::PropertySetFactory
 {
   // = TITLE
-  //     The PropertyNamesIterator interface allows a client to
-  //     iterate through the names using the next_one or next_n operations.
+  //     Factory class for the TAO_PropertySet class objects.
   //
   // = DESCRIPTION
-  //     A PropertySet maintains a set of name-value pairs. The
-  //     get_all_property_names operation returns a sequence of names
-  //     (PropertyNames). If there are additional names, the
-  //     get_all_property_names operation returns an object supporting
-  //     the PropertyNamesIterator interface with the additional names.
+  //     The object may be created with some predfined properties.
 public:
   // = Initialization and termination methods.
-  TAO_PropertyNamesIterator (TAO_PropertySet &property_set);
+
+  TAO_PropertySetFactory (void);
   // Constructor.
 
-  virtual ~TAO_PropertyNamesIterator (void);
+  virtual ~TAO_PropertySetFactory (void);
   // Destructor.
 
-  virtual void reset (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The reset operation resets the position in an iterator to the
-  // first property name, if one exists.
-
-  virtual CORBA::Boolean next_one (CORBA::String_out property_name,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The next_one operation returns true if an item exists at the
-  // current position in the iterator with an output parameter of a
-  // property name. A return of false signifies no more items in the iterator.
+  virtual CosPropertyService::PropertySet_ptr
+  create_propertyset (CORBA::Environment &env);
+  // Returns a  new TAO_PropertySet object. "The property set returned
+  // will *not* have any initial properties."
 
+  virtual CosPropertyService::PropertySet_ptr
+  create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
+                                  const CosPropertyService::Properties &allowed_properties,
+                                  CORBA::Environment &env);
+  // Allows a client to create a new TAO_PropertySet with specific
+  // constraints. "All the properties will have *fixed-normal* modes".
 
-  virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::PropertyNames_out property_names,
-                                 CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The next_n operation returns true if an item exists at the
-  // current position in the iterator and the how_many parameter was
-  // set greater than zero. The output is a PropertyNames sequence
-  // with at most the how_many number of names. A return of false
-  // signifies no more items in the iterator.
+  virtual CosPropertyService::PropertySet_ptr
+  create_initial_propertyset (const CosPropertyService::Properties &initial_properties,
+                              CORBA::Environment &env);
+  // Allows a client to create a new TAO_PropertySet with specific
+  // initial properties."All the properties will have *fixed-normal"
+  // modes".
 
-  virtual void destroy (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Destroys the iterator.
 private:
-  typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_MAP;
-  typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_ITERATOR;
-  typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
-          COSPROPERTY_HASH_ENTRY;
-
-  COSPROPERTY_HASH_ITERATOR iterator_;
-  // The Iterator object.
+  TAO_Unbounded_Sequence<TAO_PropertySet*> propertyset_products_;
+  // The PropertySet objects new'ed and given to the client. Let us
+  // keep track all of them so that we can delete them at the end.
 };
 
-// ============================================================================
+class TAO_ORBSVCS_Export TAO_PropertySetDefFactory : public virtual POA_CosPropertyService::PropertySetDefFactory
+{
+  // = TITLE
+  //     Factory class for the TAO_PropertySetDef objects.
+  //
+  // = DESCRIPTION
+  //     The object creation may be done with some predefined properties.
+public:
+  // = Initialization and termination methods.
+
+  TAO_PropertySetDefFactory(void);
+  // Constructor.
+
+  virtual ~TAO_PropertySetDefFactory (void);
+  // Destructor.
+
+  virtual CosPropertyService::PropertySetDef_ptr create_propertysetdef (CORBA::Environment &env);
+  // Returns a new TAO_PropertySetDef object.
+
+  virtual CosPropertyService::PropertySetDef_ptr
+  create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
+                                     const CosPropertyService::PropertyDefs &allowed_property_defs,
+                                     CORBA::Environment &env);
+  // Allows a client to create a new TAO_PropertySetDef with specific
+  // constraints.
+
+  virtual CosPropertyService::PropertySetDef_ptr
+  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs,
+                                 CORBA::Environment &env);
+  // Allows a client to create a new TAO_PropertySetDef with specific
+  // initial properties.
+
+private:
+  TAO_Unbounded_Sequence<TAO_PropertySetDef*> propertysetdef_products_;
+  // The PropertySet objects new'ed and given to the client. Let us
+  // keep track all of them so that we can delete them at the end.
+};
 
 class TAO_ORBSVCS_Export TAO_PropertiesIterator : public virtual PortableServer::RefCountServantBase,
                                                   public virtual POA_CosPropertyService::PropertiesIterator
@@ -565,13 +482,11 @@ public:
   virtual ~TAO_PropertiesIterator (void);
   // Destructor.
 
-  virtual void reset (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void reset (CORBA::Environment &env);
   // Resets the position in an iterator to the first property, if one exists.
 
   virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
   // property. A return of false signifies no more items in the
@@ -579,16 +494,14 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
                                  CosPropertyService::Properties_out nproperties,
-                                 CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 CORBA::Environment &env);
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
   // set greater than zero. The output is a properties sequence with
   // at most the how_many number of properties. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (CORBA::Environment &env);
   // Destroys the iterator.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 6c0c748ee4f..2d95a6afdb8 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -30,7 +30,7 @@ ACE_Runtime_Scheduler (int config_count,
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::create (const char *entry_point,
                                CORBA::Environment &)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
   // Just make sure it's there and return its handle.
@@ -49,7 +49,7 @@ ACE_Runtime_Scheduler::create (const char *entry_point,
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::lookup (const char * entry_point,
                                CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+    TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return create (entry_point, TAO_IN_ENV);
 }
@@ -60,7 +60,7 @@ ACE_Runtime_Scheduler::lookup (const char * entry_point,
 RtecScheduler::RT_Info *
 ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle,
                             CORBA::Environment &ACE_TRY_ENV)
-     ACE_THROW_SPEC((CORBA::SystemException,
+     TAO_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
@@ -111,7 +111,7 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
                                  CORBA::Long threads,
                                  RtecScheduler::Info_Type_t info_type,
                                  CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   // We compare the values with the ones stored and print a message on
@@ -148,7 +148,7 @@ ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
                                  RtecScheduler::Preemption_Subpriority_t& subpriority,
                                  RtecScheduler::Preemption_Priority_t& p_priority,
                                  CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
@@ -171,7 +171,7 @@ ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
                                              RtecScheduler::Preemption_Subpriority_t& subpriority,
                                              RtecScheduler::Preemption_Priority_t& p_priority,
                                              CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
@@ -196,7 +196,7 @@ ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                        CORBA::Long /* number_of_calls */,
                                        RtecScheduler::Dependency_Type_t /* dependency_type */,
                                        CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
@@ -231,7 +231,7 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
                                            RtecScheduler::Config_Info_Set_out /* configs */,
                                            RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */,
                                            CORBA::Environment &)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                       RtecScheduler::TASK_COUNT_MISMATCH))
@@ -250,7 +250,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
                                                RtecScheduler::OS_Priority& priority,
                                                RtecScheduler::Dispatching_Type_t & d_type,
                                                CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
 {
@@ -283,7 +283,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
 
 RtecScheduler::Preemption_Priority_t
 ACE_Runtime_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
   // throw an exception if a valid schedule has not been loaded
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 853a0be5c40..f49c4f5a5bb 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -39,7 +39,7 @@ public:
 
   virtual RtecScheduler::handle_t create (const char * entry_point,
                                           CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME));
   // Create an RT_Info.  In the config run scheduler this actually constructs
   // a new RT_Info.  Here, we just return its handle, or an error value if
@@ -47,13 +47,13 @@ public:
 
   virtual RtecScheduler::handle_t lookup (const char * entry_point,
                                           CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException));
+    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)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Return a pointer to the RT_Info corresponding to the passed handle.
 
@@ -68,7 +68,7 @@ public:
                     CORBA::Long threads,
                     RtecScheduler::Info_Type_t info_type,
                     CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Set characteristics of the RT_Info corresponding to the passed handle.
 
@@ -77,7 +77,7 @@ public:
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                          RtecScheduler::Preemption_Priority_t& p_priority,
                          CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
   // Returns the priority and subpriority values assigned to an RT_Info,
@@ -88,7 +88,7 @@ public:
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
   // Returns the priority and subpriority values assigned to an RT_Info,
@@ -99,7 +99,7 @@ public:
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
                                CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the config run scheduler, this method registers a dependency between
   // two RT_Infos.  In the run time scheduler, this is a no-op.
@@ -110,7 +110,7 @@ public:
                                    RtecScheduler::Config_Info_Set_out configs,
                                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
                                    CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                      RtecScheduler::TASK_COUNT_MISMATCH));
@@ -122,13 +122,13 @@ public:
                                        RtecScheduler::OS_Priority& o_priority,
                                        RtecScheduler::Dispatching_Type_t & d_type,
                                        CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     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,
+    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
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index e911cbc6daf..e900916243e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -17,8 +17,7 @@ ACE_RCSID(Sched, Config_Scheduler, "$Id$")
 
 ACE_Config_Scheduler::ACE_Config_Scheduler (void)
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
-  : scheduler_strategy_ (ACE_static_cast (RtecScheduler::Preemption_Priority_t,
-                                          TAO_MIN_CRITICAL_PRIORITY))
+  : scheduler_strategy_ ((RtecScheduler::Preemption_Priority_t) TAO_MIN_CRITICAL_PRIORITY)
   , impl (new ACE_Strategy_Scheduler (scheduler_strategy_))
 #else
   : impl (new Scheduler_Generic)
@@ -35,7 +34,7 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
 RtecScheduler::handle_t
 ACE_Config_Scheduler::create (const char * entry_point,
                               CORBA::Environment &)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
   typedef RtecScheduler::RT_Info* RT_Info_ptr;
@@ -87,7 +86,7 @@ ACE_Config_Scheduler::create (const char * entry_point,
 RtecScheduler::handle_t
 ACE_Config_Scheduler::lookup (const char * entry_point,
                               CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+    TAO_THROW_SPEC ((CORBA::SystemException))
 {
   RtecScheduler::RT_Info* rt_info = 0;
   switch (impl->get_rt_info (entry_point, rt_info))
@@ -109,7 +108,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point,
 RtecScheduler::RT_Info*
 ACE_Config_Scheduler::get (RtecScheduler::handle_t handle,
                            CORBA::Environment &)
-     ACE_THROW_SPEC((CORBA::SystemException,
+     TAO_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -145,7 +144,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
                                 CORBA::Long threads,
                                 RtecScheduler::Info_Type_t info_type,
                                 CORBA::Environment &)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -177,7 +176,7 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
@@ -196,7 +195,7 @@ void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
                                                  RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                                  RtecScheduler::Preemption_Priority_t& p_priority,
                                                  CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC((CORBA::SystemException,
+     TAO_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED))
 {
@@ -211,7 +210,7 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            RtecScheduler::Dependency_Type_t
                                              dependency_type,
                                            CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
@@ -249,7 +248,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
                                                RtecScheduler::Config_Info_Set_out configs,
                                                RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
                                                CORBA::Environment &TAO_IN_ENV)
-     ACE_THROW_SPEC ((CORBA::SystemException,
+     TAO_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                       RtecScheduler::TASK_COUNT_MISMATCH))
@@ -271,7 +270,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   // anomaly severity.
   RtecScheduler::Anomaly_Severity severity = RtecScheduler::ANOMALY_NONE;
   RtecScheduler::Scheduling_Anomaly **anomaly = 0;
-  const char *anomaly_severity_msg = "NONE";
+  char *anomaly_severity_msg = "NONE";
   CORBA::ULong anomaly_index = 0;
   if (anomalies.ptr () == 0)
     {
@@ -328,7 +327,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
         ACE_DEBUG ((LM_DEBUG,
                     "%s: %s\n",
                     anomaly_severity_msg,
-                    (*anomaly)->description.in ()));
+                    (const char*) ((*anomaly)->description)));
 
         // Store the anomaly in the anomaly sequence out parameter
         anomalies[anomaly_index] = **anomaly;
@@ -383,11 +382,11 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   // return the set of scheduled RT_Infos
   if (infos.ptr () == 0)
     {
-      infos = new RtecScheduler::RT_Info_Set (impl->tasks ());
+      infos = new RtecScheduler::RT_Info_Set(impl->tasks ());
     }
   infos->length (impl->tasks ());
   for (RtecScheduler::handle_t handle = 1;
-       handle <= ACE_static_cast (RtecScheduler::handle_t, impl->tasks ());
+       handle <= (RtecScheduler::handle_t) impl->tasks ();
        ++handle)
     {
       RtecScheduler::RT_Info* rt_info = 0;
@@ -395,7 +394,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
         {
         case BaseSchedImplType::SUCCEEDED:
           // We know that handles start at 1.
-          infos[ACE_static_cast (CORBA::ULong, handle - 1)] = *rt_info;
+          infos[CORBA::ULong(handle - 1)] = *rt_info;
           break;
         case BaseSchedImplType::FAILED:
         case BaseSchedImplType::ST_UNKNOWN_TASK:
@@ -416,8 +415,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   configs->length (impl->minimum_priority_queue () + 1);
   for (RtecScheduler::Preemption_Priority_t priority = 0;
        priority <=
-         ACE_static_cast (RtecScheduler::Preemption_Priority_t,
-                          impl->minimum_priority_queue ());
+         (RtecScheduler::Preemption_Priority_t) impl->minimum_priority_queue ();
        ++priority)
     {
       RtecScheduler::Config_Info* config_info = 0;
@@ -450,7 +448,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
                                                    RtecScheduler::OS_Priority& priority,
                                                    RtecScheduler::Dispatching_Type_t & d_type,
                                                    CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
 {
@@ -469,7 +467,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
 
 RtecScheduler::Preemption_Priority_t
 ACE_Config_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index 533b6272b1f..5d4d8015ada 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -36,15 +36,15 @@ public:
 
   virtual RtecScheduler::handle_t create (const char * entry_point,
                                           CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
 
   virtual RtecScheduler::handle_t lookup (const char * entry_point,
                                           CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException));
+    TAO_THROW_SPEC((CORBA::SystemException));
 
   virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
                                        CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void set (RtecScheduler::handle_t handle,
                     RtecScheduler::Criticality_t criticality,
@@ -57,14 +57,14 @@ public:
                     CORBA::Long threads,
                     RtecScheduler::Info_Type_t info_type,
                     CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
+    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                          RtecScheduler::Preemption_Priority_t& p_priority,
                          CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
 
@@ -73,7 +73,7 @@ public:
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
 
@@ -82,7 +82,7 @@ public:
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
                                CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
 
   virtual void compute_scheduling (CORBA::Long minimum_priority,
@@ -91,7 +91,7 @@ public:
                                    RtecScheduler::Config_Info_Set_out configs,
                                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
                                    CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException,
+    TAO_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                     RtecScheduler::TASK_COUNT_MISMATCH));
@@ -100,21 +100,18 @@ public:
                                        RtecScheduler::OS_Priority& priority,
                                        RtecScheduler::Dispatching_Type_t & d_type,
                                        CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // provide 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,
+  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.
+  // 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.
+
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 87407d61c47..53af7791ed0 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -5,7 +5,7 @@
 
 // Constructor.
 TAO_TIO::TAO_TIO (TimeBase::TimeT lower,
-                  TimeBase::TimeT upper)
+		  TimeBase::TimeT upper)
 {
   this->attr_time_interval.lower_bound = lower;
   this->attr_time_interval.upper_bound = upper;
@@ -20,7 +20,6 @@ TAO_TIO::~TAO_TIO (void)
 
 TimeBase::IntervalT
 TAO_TIO::time_interval (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_time_interval;
 }
@@ -33,101 +32,100 @@ TAO_TIO::time_interval (CORBA::Environment &)
 
 CosTime::OverlapType
 TAO_TIO::spans (CosTime::UTO_ptr uto,
-                CosTime::TIO_out overlap,
-                CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+		CosTime::TIO_out overlap,
+		CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_TIO *tio = 0;
-
+  
   ACE_TRY
     {
       TimeBase::TimeT lb1 =
-        this->time_interval (ACE_TRY_ENV).lower_bound;
+	this->time_interval (ACE_TRY_ENV).lower_bound;
       ACE_TRY_CHECK;
-
+      
       TimeBase::TimeT up1 =
-        this->time_interval (ACE_TRY_ENV).upper_bound;
+	this->time_interval (ACE_TRY_ENV).upper_bound;
       ACE_TRY_CHECK;
-
+      
       TimeBase::TimeT lb2 =
-        uto->time (ACE_TRY_ENV) - uto->inaccuracy (ACE_TRY_ENV);
+	uto->time (ACE_TRY_ENV) - uto->inaccuracy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       TimeBase::TimeT up2 =
-        uto->time (ACE_TRY_ENV) + uto->inaccuracy (ACE_TRY_ENV);
+	uto->time (ACE_TRY_ENV) + uto->inaccuracy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       if (lb1 == lb2 && up1 == up2)
-        {
-          ACE_NEW_RETURN (tio,
-                          TAO_TIO (lb1, up1),
-                          CosTime::OTNoOverlap);
-          overlap = tio->_this ();
-
-          return CosTime::OTOverlap;
-        }
+	{
+	  ACE_NEW_RETURN (tio,
+			  TAO_TIO (lb1, up1),
+			  CosTime::OTNoOverlap);
+	  overlap = tio->_this ();
+	  
+	  return CosTime::OTOverlap;
+	}
       else if (lb1 > lb2 && up1 < up2)
-        {
-          ACE_NEW_RETURN (tio,
-                          TAO_TIO (lb1, up1),
-                          CosTime::OTNoOverlap);
-
-          overlap = tio->_this ();
-
-          return CosTime::OTContained;
-        }
+	{
+	  ACE_NEW_RETURN (tio,
+			  TAO_TIO (lb1, up1),
+			  CosTime::OTNoOverlap);
+	  
+	  overlap = tio->_this ();
+
+	  return CosTime::OTContained;
+	}
       else if (lb1 < lb2 && up1 > up2)
-        {
-          ACE_NEW_RETURN (tio,
-                          TAO_TIO (lb2, up2),
-                          CosTime::OTNoOverlap);
+	{
+	  ACE_NEW_RETURN (tio,
+			  TAO_TIO (lb2, up2),
+			  CosTime::OTNoOverlap);
 
-          overlap = tio->_this ();
+	  overlap = tio->_this ();
 
-          return CosTime::OTContained;
-        }
+	  return CosTime::OTContained;
+	}
       else if (lb1 < lb2)
-        {
-          if (up1 < lb2)
-            {
-              ACE_NEW_RETURN (tio,
-                              TAO_TIO (0, 0),
-                              CosTime::OTNoOverlap);
-
-              overlap = tio->_this ();
-
-              return CosTime::OTNoOverlap;
-            }
-          else
-            {
-              ACE_NEW_RETURN (tio,
-                              TAO_TIO (lb2, up1),
-                              CosTime::OTNoOverlap);
-              overlap = tio->_this ();
-
-              return CosTime::OTOverlap;
-            }
-        }
+	{
+	  if (up1 < lb2)
+	    {
+	      ACE_NEW_RETURN (tio,
+			      TAO_TIO (0, 0),
+			      CosTime::OTNoOverlap);
+
+	      overlap = tio->_this ();
+
+	      return CosTime::OTNoOverlap;
+	    }
+	  else
+	    {
+	      ACE_NEW_RETURN (tio,
+			      TAO_TIO (lb2, up1),
+			      CosTime::OTNoOverlap);
+	      overlap = tio->_this ();
+
+	      return CosTime::OTOverlap;
+	    }
+	}
       else if (up2 < lb1)
-        {
+	{
 
-          ACE_NEW_RETURN (tio,
-                          TAO_TIO (0, 0),
-                          CosTime::OTNoOverlap);
+	  ACE_NEW_RETURN (tio,
+			  TAO_TIO (0, 0),
+			  CosTime::OTNoOverlap);
 
-          overlap = tio->_this ();
+	  overlap = tio->_this ();
 
-          return CosTime::OTNoOverlap;
-        }
+	  return CosTime::OTNoOverlap;
+	}
       else
-        {
-          ACE_NEW_RETURN (tio,
-                          TAO_TIO (lb1, up2),
-                          CosTime::OTNoOverlap);
+	{
+	  ACE_NEW_RETURN (tio,
+			  TAO_TIO (lb1, up2),
+			  CosTime::OTNoOverlap);
 
-          overlap = tio->_this ();
+	  overlap = tio->_this ();
 
-        }
+	}
     }
   ACE_CATCHANY
     {
@@ -135,7 +133,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (CosTime::OTNoOverlap);
-
+  
   return CosTime::OTNoOverlap;
 }
 
@@ -147,97 +145,96 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
 
 CosTime::OverlapType
 TAO_TIO::overlaps (CosTime::TIO_ptr tio,
-                   CosTime::TIO_out overlap,
-                   CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+		   CosTime::TIO_out overlap,
+		   CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_TIO *tio_i = 0;
-
+  
   ACE_TRY
     {
       TimeBase::TimeT lb1 =
-        this->time_interval (ACE_TRY_ENV).lower_bound;
+	this->time_interval (ACE_TRY_ENV).lower_bound;
       TimeBase::TimeT up1 =
-        this->time_interval (ACE_TRY_ENV).upper_bound;
+	this->time_interval (ACE_TRY_ENV).upper_bound;
       TimeBase::TimeT lb2 =
-        tio->time_interval (ACE_TRY_ENV).lower_bound;
+	tio->time_interval (ACE_TRY_ENV).lower_bound;
       TimeBase::TimeT up2 =
-        tio->time_interval (ACE_TRY_ENV).upper_bound;
+	tio->time_interval (ACE_TRY_ENV).upper_bound;
 
       ACE_TRY_CHECK;
 
       if (lb1 == lb2 && up1 == up2)
-        {
-          ACE_NEW_RETURN (tio_i,
-                          TAO_TIO (lb1, up1),
-                          CosTime::OTNoOverlap);
-
-          overlap = tio_i->_this ();
-
-          return CosTime::OTOverlap;
-        }
+	{
+	  ACE_NEW_RETURN (tio_i,
+			  TAO_TIO (lb1, up1),
+			  CosTime::OTNoOverlap);
+
+	  overlap = tio_i->_this ();
+	  
+	  return CosTime::OTOverlap;
+	}
       else if (lb1 > lb2 && up1 < up2)
-        {
-          ACE_NEW_RETURN (tio_i,
-                          TAO_TIO (lb1, up1),
-                          CosTime::OTNoOverlap);
-
-          overlap = tio_i->_this ();
-
-          return CosTime::OTContained;
-        }
+	{
+	  ACE_NEW_RETURN (tio_i,
+			  TAO_TIO (lb1, up1),
+			  CosTime::OTNoOverlap);
+
+	  overlap = tio_i->_this ();
+	  
+	  return CosTime::OTContained;
+	}
       else if (lb1 < lb2 && up1 > up2)
-        {
-          ACE_NEW_RETURN (tio_i,
-                          TAO_TIO (lb2, up2),
-                          CosTime::OTNoOverlap);
+	{
+	  ACE_NEW_RETURN (tio_i,
+			  TAO_TIO (lb2, up2),
+			  CosTime::OTNoOverlap);
 
-          overlap = tio_i->_this ();
+	  overlap = tio_i->_this ();
 
-          return CosTime::OTContained;
-        }
+	  return CosTime::OTContained;
+	}
       else if (lb1 < lb2)
-        {
-          if (up1 < lb2)
-            {
-              ACE_NEW_RETURN (tio_i,
-                              TAO_TIO (0, 0),
-                              CosTime::OTNoOverlap);
-
-              overlap = tio_i->_this ();
-
-              return CosTime::OTNoOverlap;
-            }
-          else
-            {
-              ACE_NEW_RETURN (tio_i,
-                              TAO_TIO (lb2, up1),
-                              CosTime::OTNoOverlap);
-
-              overlap = tio_i->_this ();
-
-              return CosTime::OTOverlap;
-            }
-        }
+	{
+	  if (up1 < lb2)
+	    {
+	      ACE_NEW_RETURN (tio_i,
+			      TAO_TIO (0, 0),
+			      CosTime::OTNoOverlap);
+
+	      overlap = tio_i->_this ();
+
+	      return CosTime::OTNoOverlap;
+	    }
+	  else
+	    {
+	      ACE_NEW_RETURN (tio_i,
+			      TAO_TIO (lb2, up1),
+			      CosTime::OTNoOverlap);
+
+	      overlap = tio_i->_this ();
+
+	      return CosTime::OTOverlap;
+	    }
+	}
       else if (up2 < lb1)
-        {
-          ACE_NEW_RETURN (tio_i,
-                          TAO_TIO (0, 0),
-                          CosTime::OTNoOverlap);
+	{
+	  ACE_NEW_RETURN (tio_i,
+			  TAO_TIO (0, 0),
+			  CosTime::OTNoOverlap);
 
-          overlap = tio_i->_this ();
+	  overlap = tio_i->_this ();
 
-          return CosTime::OTNoOverlap;
-        }
+	  return CosTime::OTNoOverlap;
+	}
       else
-        {
-          ACE_NEW_RETURN (tio_i,
-                          TAO_TIO (lb1, up2),
-                          CosTime::OTNoOverlap);
+	{
+	  ACE_NEW_RETURN (tio_i,
+			  TAO_TIO (lb1, up2),
+			  CosTime::OTNoOverlap);
 
-          overlap = tio_i->_this ();
+	  overlap = tio_i->_this ();
 
-        }
+	}
     }
   ACE_CATCHANY
     {
@@ -245,26 +242,25 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (CosTime::OTNoOverlap);
-
+  
   return CosTime::OTNoOverlap;
 }
 
 CosTime::UTO_ptr
 TAO_TIO::time (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
-
+  
   ACE_NEW_THROW_EX (uto,
-                    TAO_UTO ((this->time_interval (ACE_TRY_ENV).upper_bound -
-                              this->time_interval (ACE_TRY_ENV).lower_bound) / 2,
-                             this->time_interval (ACE_TRY_ENV).upper_bound -
-                             this->time_interval (ACE_TRY_ENV).lower_bound,
-                             0),
-                    CORBA::NO_MEMORY ());
-
+		    TAO_UTO ((this->time_interval (ACE_TRY_ENV).upper_bound -
+			      this->time_interval (ACE_TRY_ENV).lower_bound) / 2,
+			     this->time_interval (ACE_TRY_ENV).upper_bound -
+			     this->time_interval (ACE_TRY_ENV).lower_bound,
+			     0),
+		    CORBA::NO_MEMORY ());
+  
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
-
+  
   return uto->_this ();
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index cca8ce959d4..b3c3abe09a4 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -18,7 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_TIO_H
-#define TAO_TIO_H
+#define	TAO_TIO_H
 
 #include "tao/TAO.h"
 #include "orbsvcs/TimeServiceS.h"
@@ -37,20 +37,18 @@ class TAO_ORBSVCS_Export TAO_TIO : public POA_CosTime::TIO
 public:
   // = Initialization and termination methods.
   TAO_TIO (TimeBase::TimeT lower,
-           TimeBase::TimeT upper);
+	   TimeBase::TimeT upper);
   // Constructor.
 
   ~TAO_TIO (void);
   // Destructor.
 
-  virtual TimeBase::IntervalT  time_interval (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::IntervalT  time_interval (CORBA::Environment &env);
   // This is the get method for the attribute time interval.
 
   virtual CosTime::OverlapType spans (CosTime::UTO_ptr time,
-                                      CosTime::TIO_out overlap,
-                                      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+				      CosTime::TIO_out overlap,
+				      CORBA::Environment &env);
   // This operation returns a value of type OverlapType depending on
   // how the interval in the object and the time range represented by
   // the parameter UTO overlap.  If OverlapType is not OTNoOverlap,
@@ -59,17 +57,15 @@ public:
   // intervals.
 
   virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval,
-                                         CosTime::TIO_out overlap,
-                                         CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					 CosTime::TIO_out overlap,
+					 CORBA::Environment &env);
   // This operation returns a value of type OverlapType depending on
   // how the interval in the object and interval in the parameter TIO
   // overlap. If OverlapType is not OTNoOverlap, then the out
   // parameter overlap contains the overlap interval, otherwise the
   // out parameter contains the gap between the two intervals.
 
-  virtual CosTime::UTO_ptr time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosTime::UTO_ptr time (CORBA::Environment &env);
   // Returns a UTO in which the inaccuracy interval is equal to the
   // time interval in the TIO and time value is the midpoint of the
   // interval.
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 7ab3143518f..b1de20420ed 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -7,7 +7,7 @@
 
 // Constructor.
 TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value,
-                                                const IORS& servers)
+						const IORS& servers)
   : server_ (servers),
     helper_ (this)
 {
@@ -20,8 +20,8 @@ TAO_Time_Service_Clerk::TAO_Time_Service_Clerk (int timer_value,
        ACE_Time_Value::zero,
        ACE_Time_Value (timer_value)) == -1)
     ACE_ERROR ((LM_ERROR,
-                "%p\n",
-                "schedule_timer ()"));
+		"%p\n",
+		"schedule_timer ()"));
 }
 
 // Destructor.
@@ -35,8 +35,6 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable))
 {
   TAO_UTO *uto = 0;
 
@@ -57,8 +55,6 @@ TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable))
 {
   env.exception (new CORBA::NO_IMPLEMENT ());
   return 0;
@@ -68,10 +64,9 @@ TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &env)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
-                                            TimeBase::InaccuracyT inaccuracy,
-                                            TimeBase::TdfT tdf,
-                                            CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+					    TimeBase::InaccuracyT inaccuracy,
+					    TimeBase::TdfT tdf,
+					    CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_UTO *uto = 0;
 
@@ -88,8 +83,7 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
 
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc,
-                                      CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+				      CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_UTO *uto = 0;
 
@@ -113,9 +107,8 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc,
 
 CosTime::TIO_ptr
 TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
-                                      TimeBase::TimeT upper,
-                                      CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+				      TimeBase::TimeT upper,
+				      CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_TIO *tio = 0;
 
@@ -135,12 +128,12 @@ TAO_Time_Service_Clerk::get_time (void)
   CORBA::ULongLong time;
 
   time = (CORBA::ULongLong) (ACE_static_cast (CORBA::ULongLong,
-                                              ACE_OS::gettimeofday ().sec ()) *
+                                              ACE_OS::gettimeofday ().sec ()) * 
                              ACE_static_cast (ACE_UINT32,
                                               10000000) +
-                             ACE_static_cast (CORBA::ULongLong,
+                             ACE_static_cast (CORBA::ULongLong, 
                                               ACE_OS::gettimeofday ().usec () * 10))
-    - this->update_timestamp_
+    - this->update_timestamp_ 
     + this->time_;
 
   return time;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index 6805e8f844d..bf1dc48e071 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -18,7 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_TIME_SERVICE_CLERK_H
-#define TAO_TIME_SERVICE_CLERK_H
+#define	TAO_TIME_SERVICE_CLERK_H
 
 #include "ace/Reactor.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
@@ -48,42 +48,35 @@ public:
 
   // = Initialization and termination methods.
   TAO_Time_Service_Clerk (int timer_value,
-                          const IORS& server);
+			  const IORS& server);
   // Constructor.
 
   ~TAO_Time_Service_Clerk (void);
   // Destructor.
 
-  virtual CosTime::UTO_ptr universal_time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable));
+  virtual CosTime::UTO_ptr universal_time (CORBA::Environment &env);
   // This operation returns the global time and an estimate of
   // inaccuracy in a UTO.
 
-  virtual CosTime::UTO_ptr secure_universal_time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable));
+  virtual CosTime::UTO_ptr secure_universal_time (CORBA::Environment &env);
   // This operation returns the global time in a UTO only if the time
   // can be guaranteed to have been obtained securely. Currently this
   // operation is not implemented and throws a CORBA::NO_IMPLEMENT
   // exception, if called.
 
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
-                                               TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf,
-                                               CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					       TimeBase::InaccuracyT inaccuracy,
+					       TimeBase::TdfT tdf,
+					       CORBA::Environment &env);
   // This creates a new UTO based on the given parameters.
 
   virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc,
-                                         CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					 CORBA::Environment &env);
   // This creates a new UTO given a time in the UtcT form.
 
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper,
-                                         CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					 TimeBase::TimeT upper,
+					 CORBA::Environment &env);
   // This creates a new TIO with the given parameters.
 
   virtual CORBA::ULongLong get_time (void);
@@ -92,19 +85,19 @@ public:
   void name_server (TAO_Naming_Server &server);
   // This method is called by the driver program to set the Naming
   // Server instance.
-
+  
   CORBA::Short time_displacement_factor (void);
   // Returns the time displacement factor.
-
+  
   void time_displacement_factor (CORBA::Short);
   // Set the TDF.
-
+  
   TimeBase::InaccuracyT inaccuracy (void);
-  // GET method for inaccuracy.
-
+  // GET method for inaccuracy.   
+  
   void inaccuracy (TimeBase::InaccuracyT inaccuracy);
-  // SET method for inaccuracy.
-
+  // SET method for inaccuracy.    
+  
   CORBA::ULongLong time_;
   // Clerk's notion of time.
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 5b94a8eebc3..4603be30a86 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -21,15 +21,13 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable))
 {
   TAO_UTO *uto = 0;
 
   // Return the local time of the system as a UTO.
   ACE_NEW_THROW_EX (uto,
                     TAO_UTO (ACE_static_cast(CORBA::ULongLong,
-                                             ACE_OS::gettimeofday ().sec ()) *
+                                             ACE_OS::gettimeofday ().sec ()) * 
                              ACE_static_cast(ACE_UINT32,
                                              10000000) +
                              ACE_static_cast(CORBA::ULongLong,
@@ -41,17 +39,17 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
   ACE_DEBUG ((LM_DEBUG,
-              "Returning a UTO\n"));
+	      "Returning a UTO\n"));
 
   return uto->_this ();
 
   // In case we are using the IR.
   //   if (this->shutdown_ != 0)
   //       {
-  //    TAO_ORB_Core_instance ()->orb ()->shutdown ();
+  // 	TAO_ORB_Core_instance ()->orb ()->shutdown ();
 
-  //    ACE_DEBUG ((LM_DEBUG,
-  //                "Shutting down the ORB\n"));
+  // 	ACE_DEBUG ((LM_DEBUG,
+  // 		    "Shutting down the ORB\n"));
   //       }
 
 }
@@ -62,8 +60,6 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable))
 {
   env.exception (new CORBA::NO_IMPLEMENT ());
   return 0;
@@ -73,10 +69,9 @@ TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &env)
 
 CosTime::UTO_ptr
 TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
-                                             TimeBase::InaccuracyT inaccuracy,
-                                             TimeBase::TdfT tdf,
-                                             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+					     TimeBase::InaccuracyT inaccuracy,
+					     TimeBase::TdfT tdf,
+					     CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_UTO *uto = 0;
 
@@ -95,8 +90,7 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
 
 CosTime::UTO_ptr
 TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc,
-                                       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+				       CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_UTO *uto = 0;
 
@@ -113,9 +107,8 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc,
 
 CosTime::TIO_ptr
 TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
-                                       TimeBase::TimeT upper,
-                                       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+				       TimeBase::TimeT upper,
+				       CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_TIO *tio = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index 6abb37123fb..bb7d0ee6297 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -18,7 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_TIME_SERVICE_SERVER_H
-#define TAO_TIME_SERVICE_SERVER_H
+#define	TAO_TIME_SERVICE_SERVER_H
 
 #include "orbsvcs/TimeServiceS.h"
 
@@ -43,35 +43,28 @@ public:
   ~TAO_Time_Service_Server (void);
   // Destructor.
 
-  virtual CosTime::UTO_ptr universal_time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable));
+  virtual CosTime::UTO_ptr universal_time (CORBA::Environment &env);
   // This operation returns the current system time and an estimate of
   // inaccuracy in a UTO.
 
-  virtual CosTime::UTO_ptr secure_universal_time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTime::TimeUnavailable));
+  virtual CosTime::UTO_ptr secure_universal_time (CORBA::Environment &env);
   // This operation returns the current time in a UTO only if the time
   // can be guaranteed to have been obtained securely. Currently this operation
   // is not implemented and throws a CORBA::NO_IMPLEMENT exception, if called.
 
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
-                                               TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf,
-                                               CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					       TimeBase::InaccuracyT inaccuracy,
+					       TimeBase::TdfT tdf,
+					       CORBA::Environment &env);
   // This creates a new UTO based on the given parameters.
 
   virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc,
-                                         CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					 CORBA::Environment &env);
   // This creates a new UTO given a time in the UtcT form.
 
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper,
-                                         CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					 TimeBase::TimeT upper,
+					 CORBA::Environment &env);
   // This creates a new TIO with the given parameters.
 
   int shutdown_;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index a8bedd3c2f7..6a00579ab62 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -41,7 +41,6 @@ TAO_UTO::~TAO_UTO (void)
 
 TimeBase::TimeT
 TAO_UTO::time (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.time;
 }
@@ -50,7 +49,6 @@ TAO_UTO::time (CORBA::Environment &)
 
 TimeBase::InaccuracyT
 TAO_UTO::inaccuracy (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Construct the Inaccuracy from the
   // inacchi and inacclo.
@@ -65,7 +63,6 @@ TAO_UTO::inaccuracy (CORBA::Environment &)
 
 TimeBase::TdfT
 TAO_UTO::tdf (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.tdf;
 }
@@ -74,7 +71,6 @@ TAO_UTO::tdf (CORBA::Environment &)
 
 TimeBase::UtcT
 TAO_UTO::utc_time (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_;
 }
@@ -84,7 +80,6 @@ TAO_UTO::utc_time (CORBA::Environment &)
 
 CosTime::UTO_ptr
 TAO_UTO::absolute_time (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
@@ -96,7 +91,6 @@ CosTime::TimeComparison
 TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
                        CosTime::UTO_ptr uto,
                        CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
@@ -152,7 +146,7 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (CosTime::TCIndeterminate);
-
+  
   return CosTime::TCIndeterminate;
 }
 
@@ -165,7 +159,6 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
 CosTime::TIO_ptr
 TAO_UTO::time_to_interval (CosTime::UTO_ptr uto,
                            CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
@@ -173,22 +166,22 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto,
     {
       if (this->time (ACE_TRY_ENV) > uto->time (ACE_TRY_ENV))
         {
-          ACE_NEW_THROW_EX (tio,
-                            TAO_TIO (uto->time (ACE_TRY_ENV),
-                                     this->time (ACE_TRY_ENV)),
-                            CORBA::NO_MEMORY ());
-
-          ACE_TRY_CHECK;
-        }
+	  ACE_NEW_THROW_EX (tio,
+			    TAO_TIO (uto->time (ACE_TRY_ENV),
+				     this->time (ACE_TRY_ENV)),
+			    CORBA::NO_MEMORY ());
+	  
+	  ACE_TRY_CHECK;
+	}
       else
         {
-          ACE_NEW_THROW_EX (tio,
-                            TAO_TIO (this->time (ACE_TRY_ENV),
-                                     uto->time (ACE_TRY_ENV)),
-                            CORBA::NO_MEMORY ());
-
-          ACE_TRY_CHECK;
-        }
+	  ACE_NEW_THROW_EX (tio,
+			    TAO_TIO (this->time (ACE_TRY_ENV),
+				     uto->time (ACE_TRY_ENV)),
+			    CORBA::NO_MEMORY ());
+	  
+	  ACE_TRY_CHECK;
+	}
     }
   ACE_CATCHANY
     {
@@ -197,7 +190,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto,
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (CosTime::TIO::_nil ());
-
+  
   return tio->_this ();
 }
 
@@ -206,10 +199,9 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto,
 
 CosTime::TIO_ptr
 TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
-
+  
   ACE_TRY
     {
       TimeBase::TimeT lower =
@@ -221,10 +213,10 @@ TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV)
       ACE_TRY_CHECK;
 
       ACE_NEW_THROW_EX (tio,
-                        TAO_TIO (lower,
-                                 upper),
-                        CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
+			TAO_TIO (lower,
+				 upper),
+			CORBA::NO_MEMORY ());
+      ACE_TRY_CHECK;      
     }
   ACE_CATCHANY
     {
@@ -233,6 +225,7 @@ TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (CosTime::TIO::_nil ());
-
+  
   return tio->_this ();
 }
+
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index b141b453cd4..4360cf131b7 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -18,7 +18,7 @@
 // ============================================================================
 
 #ifndef TAO_UTO_H
-#define TAO_UTO_H
+#define	TAO_UTO_H
 
 #include "orbsvcs/TimeServiceS.h"
 
@@ -46,54 +46,46 @@ class TAO_ORBSVCS_Export TAO_UTO : public POA_CosTime::UTO
 public:
   // = Initialization and termination methods.
   TAO_UTO (TimeBase::TimeT time,
-           TimeBase::InaccuracyT inaccuracy,
-           TimeBase::TdfT tdf);
+	   TimeBase::InaccuracyT inaccuracy,
+	   TimeBase::TdfT tdf);
   // Constructor.
 
   ~TAO_UTO (void);
   // Destructor.
 
-  virtual TimeBase::TimeT time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::TimeT time (CORBA::Environment &env);
   // For the readonly attribute <time>.
 
-  virtual TimeBase::InaccuracyT  inaccuracy (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::InaccuracyT  inaccuracy (CORBA::Environment &env);
   // For the readonly attribute <inaccuracy>.
 
-  virtual TimeBase::TdfT tdf (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::TdfT tdf (CORBA::Environment &env);
   // For the readonly attribute <tdf>, which is the "time displacement
   // factor".
 
-  virtual TimeBase::UtcT utc_time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual TimeBase::UtcT utc_time (CORBA::Environment &env);
   // For the readonly attribute <utc_time>.
 
-  CosTime::UTO_ptr absolute_time (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CosTime::UTO_ptr absolute_time (CORBA::Environment &env);
   // Absolute time = Relative time + Base time.
   // ?? Find out more about the Base Time, UTC and
   //    Distributed Time Sync. Algos. [3
 
   CosTime::TimeComparison compare_time (CosTime::ComparisonType comparison_type,
-                                        CosTime::UTO_ptr uto,
-                                        CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+					CosTime::UTO_ptr uto,
+					CORBA::Environment &env);
   // Compares the time contained in the object with the time in the
   // supplied uto according to the supplied comparison type.
 
   CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr,
-                                     CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+				     CORBA::Environment &env);
   // Returns a TIO representing the time interval between the time in
   // the object and the time in the UTO passed as a parameter. The
   // interval returned is the interval between the mid-points of the
   // two UTOs. Inaccuracies are ignored.  Note the result of this
   // operation is meaningless if the base times of UTOs are different.
 
-  CosTime::TIO_ptr interval (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CosTime::TIO_ptr interval (CORBA::Environment &env);
   // Returns a TIO object representing the error interval around the
   // time value in the UTO.
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 75de50ad531..6c29d3f4c9c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -79,7 +79,7 @@ TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                             const char* constraints,
                             CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalConstraint))
+  TAO_THROW_SPEC ((CosTrading::IllegalConstraint))
   : TAO_Interpreter ()
 {
   TAO_Constraint_Validator type_checker (ts);
@@ -100,7 +100,7 @@ TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter(TAO_Constraint_Validator& validator,
                            const char* constraints,
                            CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalConstraint))
+  TAO_THROW_SPEC ((CosTrading::IllegalConstraint))
 {
   if (TAO_Interpreter::is_empty_string (constraints))
     this->root_ = new TAO_Literal_Constraint ((CORBA::Boolean) 1);
@@ -139,7 +139,7 @@ TAO_Preference_Interpreter::
 TAO_Preference_Interpreter(const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                            const char* preference,
                            CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference))
+  TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference))
   : TAO_Interpreter ()
 {
   TAO_Constraint_Validator type_checker (ts);
@@ -160,7 +160,7 @@ TAO_Preference_Interpreter::
 TAO_Preference_Interpreter(TAO_Constraint_Validator& validator,
                            const char* preference,
                            CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference))
+  TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference))
     : TAO_Interpreter ()
 {
   if (TAO_Interpreter::is_empty_string (preference))
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 462e91ae51b..26a1fb12b91 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -76,12 +76,12 @@ public:
   TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                               const char* constraints,
                               CORBA::Environment& env)
-    ACE_THROW_SPEC ((CosTrading::IllegalConstraint));
+    TAO_THROW_SPEC ((CosTrading::IllegalConstraint));
 
   TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
                               const char* constraints,
                               CORBA::Environment& env)
-    ACE_THROW_SPEC ((CosTrading::IllegalConstraint));
+    TAO_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
@@ -121,12 +121,12 @@ public:
   TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                               const char* preference,
                               CORBA::Environment& env)
-    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference));
+    TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference));
 
   TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
                               const char* preference,
                               CORBA::Environment& env)
-    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference));
+    TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPreference));
 
   // Parse the preference string, determining first if it's
   // valid. Throw an IllegalPreference exception if the preference
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index d2b6009b262..ddffa05012b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -619,9 +619,7 @@ sequence_does_contain (CORBA::Any* sequence,
   return return_value;
 }
 
-// Explicit template specializations
-
-ACE_TEMPLATE_SPECIALIZATION int
+int
 TAO_Element_Equal<CORBA::Short>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Short element) const
@@ -637,7 +635,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   return return_value;
 }
 
-ACE_TEMPLATE_SPECIALIZATION int
+int
 TAO_Element_Equal<CORBA::UShort>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::UShort element) const
@@ -653,7 +651,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   return return_value;
 }
 
-ACE_TEMPLATE_SPECIALIZATION int
+int
 TAO_Element_Equal<CORBA::Long>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Long element) const
@@ -669,7 +667,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   return return_value;
 }
 
-ACE_TEMPLATE_SPECIALIZATION int
+int
 TAO_Element_Equal<CORBA::ULong>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::ULong element) const
@@ -685,7 +683,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   return return_value;
 }
 
-ACE_TEMPLATE_SPECIALIZATION int
+int
 TAO_Element_Equal<CORBA::Float>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Float element) const
@@ -701,7 +699,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   return return_value;
 }
 
-ACE_TEMPLATE_SPECIALIZATION int
+int
 TAO_Element_Equal<CORBA::Double>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Double element) const
@@ -717,7 +715,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   return return_value;
 }
 
-ACE_TEMPLATE_SPECIALIZATION int
+int
 TAO_Element_Equal<CORBA::Boolean>::
 operator () (TAO_DynSequence_i& dyn_any,
              CORBA::Boolean element) const
@@ -733,7 +731,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   return return_value;
 }
 
-ACE_TEMPLATE_SPECIALIZATION int
+int
 TAO_Element_Equal<const char*>::
 operator () (TAO_DynSequence_i& dyn_any,
              const char* element) const
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index c8bb93f31ce..4aa178f59ac 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -145,7 +145,7 @@ template <class LOCK_TYPE> int
 TAO_Offer_Database<LOCK_TYPE>::
 remove_offer (const CosTrading::OfferId offer_id,
               CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
+  TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
   char* stype = 0;
@@ -165,7 +165,7 @@ TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
               char*& type_name,
               CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
+  TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
   CORBA::ULong index;
@@ -184,7 +184,7 @@ template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
               CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
+  TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
   char* type_name;
@@ -264,7 +264,7 @@ parse_offer_id (const CosTrading::OfferId offer_id,
                 char*&service_type,
                 CORBA::ULong& id,
                 CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalOfferId))
+  TAO_THROW_SPEC ((CosTrading::IllegalOfferId))
 {
   // Get service type: it is everything from 17th character to the end.
   service_type = (char *) offer_id + 16;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 7edebd44946..653d6d553bf 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -65,12 +65,12 @@ public:
 
   int remove_offer (const CosTrading::OfferId offer_id,
                     CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
+    TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
                                    CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
+    TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
   // Lookup an offer whose offer_id is <offer_id>, and return
   // it. Otherwise, throw the appropriate exception.
@@ -78,7 +78,7 @@ public:
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
                                    char*& type_name,
                                    CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
+    TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
   // Lookup an offer whose OfferId is <offer_id> and return in
   // <type_name> the type name of the object. Type name is just a
@@ -131,7 +131,7 @@ private:
                               char* &service_type,
                               CORBA::ULong& id,
                               CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTrading::IllegalOfferId));
+    TAO_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 670a6d28e1b..0c5357eacb9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -1,16 +1,16 @@
 // ========================================================================
 // $Id$
-//
+// 
 // = LIBRARY
 //    orbsvcs
-//
+// 
 // = FILENAME
 //   Offer_Iterators.cpp
 //
 // = AUTHOR
 //    Marina Spivak <marina@cs.wustl.edu>
 //    Seth Widoff <sbw1@cs.wustl.edu>
-//
+// 
 // ========================================================================
 
 #include "Offer_Iterators.h"
@@ -30,16 +30,16 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void)
 {
 }
 
-void
+void 
 TAO_Offer_Iterator::destroy (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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
   //
-
+  
   TAO_TRY
     {
       PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
@@ -47,12 +47,12 @@ TAO_Offer_Iterator::destroy (CORBA::Environment &)
 
       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_CHECK_ENV;      
     }
   TAO_CATCHANY
-    {
+    {      
     }
   TAO_ENDTRY;
 }
@@ -60,7 +60,7 @@ TAO_Offer_Iterator::destroy (CORBA::Environment &)
   // *************************************************************
   // TAO_Query_Only_Offer_Iterator
   // *************************************************************
-
+                
 TAO_Query_Only_Offer_Iterator::
 TAO_Query_Only_Offer_Iterator(const TAO_Property_Filter& pfilter)
   : TAO_Offer_Iterator (pfilter)
@@ -73,32 +73,32 @@ TAO_Query_Only_Offer_Iterator::~TAO_Query_Only_Offer_Iterator(void)
 
 void
 TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id,
-                                          const CosTrading::Offer* offer)
+					  const CosTrading::Offer* offer)
 {
   this->offers_.enqueue_tail ((CosTrading::Offer*) offer);
   CORBA::string_free (offer_id);
 }
 
-CORBA::ULong
-TAO_Query_Only_Offer_Iterator::max_left (CORBA::Environment &)
-  ACE_THROW_SPEC((CORBA::SystemException,
-                 CosTrading::UnknownMaxLeft))
+CORBA::ULong 
+TAO_Query_Only_Offer_Iterator::max_left (CORBA::Environment &) 
+  TAO_THROW_SPEC((CORBA::SystemException, 
+		 CosTrading::UnknownMaxLeft))
 {
   return this->offers_.size ();
 }
 
-CORBA::Boolean
-TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
+CORBA::Boolean 
+TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n, 
                                        CosTrading::OfferSeq_out offers,
-                                                               CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+				                               CORBA::Environment &) 
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   offers = new CosTrading::OfferSeq;
 
   CORBA::ULong sequence_size = this->offers_.size ();
   CORBA::ULong offers_in_sequence = (n < sequence_size) ? n : sequence_size;
   offers->length (offers_in_sequence);
-
+  
   // populate the sequence.
   for (CORBA::ULong i = 0; i < offers_in_sequence; i++)
     {
@@ -107,7 +107,7 @@ TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
       this->offers_.dequeue_head (source);
       this->pfilter_.filter_offer (source, offers[i]);
     }
-
+  
   return offers_in_sequence != 0;
 }
 
@@ -130,7 +130,7 @@ TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void)
         {
           offer_iter->destroy (TAO_TRY_ENV);
           TAO_CHECK_ENV;
-
+          
           CORBA::release (offer_iter);
         }
       TAO_CATCHANY {}
@@ -148,14 +148,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 &env)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+				       CosTrading::OfferSeq_out offers,
+				       CORBA::Environment &env)
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong offers_left = n;
   CORBA::Boolean return_value = 1;
   CosTrading::OfferSeq_var out_offers;
-
+  
   ACE_NEW_RETURN (offers, CosTrading::OfferSeq, return_value);
   while (offers_left > 0 && ! this->iters_.is_empty ())
     {
@@ -165,7 +165,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
       this->iters_.dequeue_head (iter);
 
       // Determine how many offers we should retrieve from this
-      // iterator.
+      // iterator. 
 
       TAO_TRY
         {
@@ -190,8 +190,8 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
           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 ();
+          
+          offers_left -= out_offers->length ();          
         }
       TAO_CATCHANY
         {
@@ -207,8 +207,8 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
 }
 
 void
-TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& TAO_IN_ENV)  
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy all iterators in the collection.
   for (Offer_Iters::ITERATOR iters_iter (this->iters_);
@@ -226,27 +226,27 @@ TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& TAO_IN_ENV)
   // Note that there is no real error checking here as we can't do
   // much about errors here anyway
   //
-
+  
   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);
+	poa->servant_to_id (this, TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       poa->deactivate_object (id.in (), TAO_TRY_ENV);
     }
   TAO_CATCHANY
-    {
+    {      
     }
   TAO_ENDTRY;
 }
 
 CORBA::ULong
 TAO_Offer_Iterator_Collection::max_left (CORBA::Environment &TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::UnknownMaxLeft))
+  TAO_THROW_SPEC ((CORBA::SystemException,
+		   CosTrading::UnknownMaxLeft))
 {
   TAO_THROW_RETURN (CosTrading::UnknownMaxLeft(), 0);
 }
@@ -267,45 +267,45 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void)
   do
     {
       CosTrading::OfferId offer_id = 0;
-
+      
       return_value = this->ids_.dequeue_head (offer_id);
       if (return_value == 0)
-        CORBA::string_free (offer_id);
+	CORBA::string_free (offer_id);
     }
   while (return_value == 0);
 }
 
 CORBA::ULong
 TAO_Offer_Id_Iterator::max_left (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                  CosTrading::UnknownMaxLeft))
+  TAO_THROW_SPEC ((CORBA::SystemException,
+		  CosTrading::UnknownMaxLeft))
 {
   return this->ids_.size ();
 }
 
 void
 TAO_Offer_Id_Iterator::destroy (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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
   //
-
+  
   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 (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
-    {
+    {      
     }
   TAO_ENDTRY;
 }
@@ -314,14 +314,14 @@ CORBA::Boolean
 TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
                                CosTrading::OfferIdSeq_out _ids,
                                CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   // Calculate the number of Ids to be returned in this.
   int items_left = this->ids_.size(),
     difference = items_left - n,
     returnable_items = (difference >= 0) ? n : items_left;
   CORBA::Boolean return_value = (CORBA::Boolean) (difference > 0);
-
+    
   if (returnable_items == 0)
     {
       ACE_NEW_RETURN (_ids, CosTrading::OfferIdSeq, return_value);
@@ -333,7 +333,7 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
 	CosTrading::OfferIdSeq::allocbuf (returnable_items);
 
       if (id_buf != 0)
-	{
+	{      
 	  // Copy in those ids!
 	  for (int i = 0; i < returnable_items; i++)
 	    {
@@ -342,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,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index c5cd1c2448d..5bf84a97100 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -49,7 +49,7 @@ public:
   virtual ~TAO_Offer_Iterator (void);
 
   virtual void destroy (CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // BEGIN SPEC
   // The destroy operation destroys the iterator. No further
   // operations can be invoked on an iterator after it has been
@@ -62,7 +62,7 @@ public:
   // iterate over.
 
   virtual CORBA::ULong max_left (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft)) = 0;
 
   // BEGIN SPEC
@@ -76,7 +76,7 @@ public:
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers,
                                  CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    TAO_THROW_SPEC ((CORBA::SystemException)) = 0;
   // BEGIN SPEC
   // The next_n operation returns a set of service offers in the
   // output parameter "offers." The operation returns n service offers
@@ -128,12 +128,12 @@ public:
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers,
                                  CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_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& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
   // Return the number of items left in the iterator.
 
@@ -184,15 +184,15 @@ public:
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers,
                                  CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Retrieve n offers from the set of iterators.
 
   virtual void destroy (CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Destroy the collection of iterators.
 
   virtual CORBA::ULong max_left (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::UnknownMaxLeft));
   // Determine how many offers are left in the collection.
 
@@ -239,7 +239,7 @@ class TAO_Offer_Id_Iterator :
   ~TAO_Offer_Id_Iterator (void);
 
   virtual CORBA::ULong max_left(CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
   // The max_left operation returns the number of offer identifiers
   // remaining in the iterator. The exception UnknownMaxLeft is raised
@@ -248,7 +248,7 @@ class TAO_Offer_Id_Iterator :
   // identifiers through lazy evaluation).
 
   virtual void destroy(CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // The destroy operation destroys the iterator. No further
   // operations can be invoked on an iterator after it has been
   // destroyed.
@@ -256,7 +256,7 @@ class TAO_Offer_Id_Iterator :
   virtual CORBA::Boolean next_n(CORBA::ULong _n,
                                 CosTrading::OfferIdSeq_out _ids,
                                 CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_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
   // if there are at least n offer identifiers remaining in the
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index 2a501a94c7b..7c6a5cd6daa 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -53,7 +53,7 @@ add_offer (CosTrading::OfferId id,
 template <class MAP_LOCK_TYPE> CORBA::ULong
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 max_left (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
   return this->offer_ids_.size ();
@@ -64,7 +64,7 @@ TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 next_n (CORBA::ULong n,
         CosTrading::OfferSeq_out offers,
         CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong ret_offers = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 1af30631650..beae59855fd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -47,12 +47,12 @@ public:
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers,
                                  CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_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_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::UnknownMaxLeft));
   // Throws CosTrading::UnknownMaxLeft since with the presence of
   // "Register" functionality, the iterator cannot guarantee that
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index a9386747480..be883ab595b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -54,7 +54,6 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
 
 CosTradingRepos::ServiceTypeRepository::IncarnationNumber
 TAO_Service_Type_Repository::incarnation (CORBA::Environment &)
-      ACE_THROW_SPEC (())
 {
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
   if (this->lock_->acquire_read () == -1)
@@ -79,7 +78,7 @@ add_type (const char * name,
           const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
           const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
           CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
                    CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
@@ -161,7 +160,7 @@ add_type (const char * name,
 void
 TAO_Service_Type_Repository::remove_type (const char * name,
                                           CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::HasSubTypes))
@@ -190,7 +189,7 @@ CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq*
 TAO_Service_Type_Repository::
 list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes& which_types,
             CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_READ_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
 
@@ -227,7 +226,7 @@ CosTradingRepos::ServiceTypeRepository::TypeStruct*
 TAO_Service_Type_Repository::
 describe_type (const char * name,
                CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
@@ -274,7 +273,7 @@ CosTradingRepos::ServiceTypeRepository::TypeStruct*
 TAO_Service_Type_Repository::
 fully_describe_type (const char * name,
                      CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
@@ -313,7 +312,7 @@ void
 TAO_Service_Type_Repository::
 mask_type (const char * name,
            CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::AlreadyMasked))
@@ -343,7 +342,7 @@ void
 TAO_Service_Type_Repository::
 unmask_type (const char * name,
              CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
                   CosTradingRepos::ServiceTypeRepository::NotMasked))
@@ -458,7 +457,7 @@ TAO_Service_Type_Repository::
 validate_properties (Prop_Map& prop_map,
                      const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
                      CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
 {
   for (CORBA::ULong i = 0; i < props.length (); i++)
@@ -483,7 +482,7 @@ TAO_Service_Type_Repository::
 validate_supertypes (Service_Type_Map& super_map,
                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
                      CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
+  TAO_THROW_SPEC ((CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
                   CosTrading::DuplicatePropertyName))
 {
@@ -514,7 +513,7 @@ TAO_Service_Type_Repository::
 validate_inheritance (Prop_Map& prop_map,
                       const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
                       CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition))
+  TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition))
 {
   CORBA::ULong num_super_types = super_types.length ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index ebb9b61f7f4..ee482f6a643 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -35,8 +35,7 @@ public:
   ~TAO_Service_Type_Repository (void);
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-    incarnation (CORBA::Environment &_env)
-      ACE_THROW_SPEC (());
+  incarnation (CORBA::Environment &_env);
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
   add_type (const char *name,
@@ -44,7 +43,7 @@ public:
             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
             CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
                      CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
@@ -98,7 +97,7 @@ public:
 
   virtual void remove_type (const char  *name,
                             CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::HasSubTypes));
@@ -114,7 +113,7 @@ public:
   virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
   list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types,
               CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
   // The list_types operation permits a client to obtain the names of
@@ -130,7 +129,7 @@ public:
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
   describe_type (const char *name,
                  CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
   // BEGIN SPEC
@@ -144,7 +143,7 @@ public:
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
   fully_describe_type (const char *name,
                        CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
   // BEGIN SPEC
@@ -161,7 +160,7 @@ public:
 
   virtual void mask_type (const char *name,
                           CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::AlreadyMasked));
@@ -180,7 +179,7 @@ public:
 
   virtual void unmask_type (const char  *name,
                             CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::NotMasked));
@@ -243,7 +242,7 @@ public:
   void validate_properties (Prop_Map &prop_map,
                             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
                             CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
   // Confirm that the properties in props have valid names, and aren't
   // duplicated. Cram those properties into the prop_map.
@@ -251,7 +250,7 @@ public:
   void validate_supertypes (Service_Type_Map &super_map,
                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
                             CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
+    TAO_THROW_SPEC ((CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTrading::DuplicatePropertyName));
   // Confirm that the each super type exists, and cram them into super_map.
@@ -259,14 +258,14 @@ public:
   void validate_inheritance (Prop_Map &prop_map,
                              const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
                              CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
+    TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
   // Ensure that properties of a super_type aren't having their types
   // or retstrictions redefined.
 
   //  void validate_interface (const char *if_name,
   //                       Service_Type_Map &super_map,
   //                       CORBA::Environment &_env)
-  //    ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch));
+  //    TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch));
   // Ensure that the interface type derives from its superclasses'.
 
   void update_type_map (const char *name,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 5c857ff1a1e..63f438059fd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -868,7 +868,7 @@ CORBA::TCKind
 TAO_Sequence_Extracter_Base::
 sequence_type (CORBA::TypeCode* type_code,
                CORBA::Environment& env)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TCKind return_value = CORBA::tk_void,
     type_kind = type_code->kind (env);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 48ee2779794..f3f04c54948 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -513,7 +513,7 @@ public:
 
   static CORBA::TCKind sequence_type (CORBA::TypeCode* code,
                                       CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Return the sequence element type for the sequence whose typecode
   // is <code>.
 };
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index d4fe3eaf7fe..8ac7f2f8d2a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -63,7 +63,7 @@ query (const char *type,
        CosTrading::OfferIterator_out returned_offer_iterator,
        CosTrading::PolicyNameSeq_out returned_limits_applied,
        CORBA::Environment& env)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTrading::IllegalConstraint,
@@ -372,7 +372,7 @@ fill_receptacles (const char* type,
                   CosTrading::OfferSeq& offers,
                   CosTrading::OfferIterator_ptr& offer_itr,
                   CORBA::Environment& env)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::DuplicatePropertyName))
 {
   // BEGIN SPEC
@@ -503,7 +503,7 @@ retrieve_links (TAO_Policies& policies,
                 CORBA::ULong offers_returned,
                 CosTrading::LinkNameSeq_out links,
                 CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean should_follow = 0;
@@ -581,7 +581,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
                  CosTrading::OfferIterator_ptr& offer_iter,
                  CosTrading::PolicyNameSeq& limits,
                  CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTrading::IllegalConstraint,
@@ -745,7 +745,7 @@ forward_query (const char* next_hop,
                CosTrading::OfferIterator_out offer_itr,
                CosTrading::PolicyNameSeq_out limits_applied,
                CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTrading::IllegalConstraint,
@@ -823,7 +823,7 @@ TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 seen_request_id (TAO_Policies& policies,
                  CosTrading::Admin::OctetSeq*& seq,
                  CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean return_value = 0;
@@ -904,7 +904,7 @@ _cxx_export (CORBA::Object_ptr reference,
              const char *type,
              const CosTrading::PropertySeq &properties,
              CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::InvalidObjectRef,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
@@ -978,7 +978,7 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw (const char *id,
           CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
                    CosTrading::Register::ProxyOfferId))
@@ -993,7 +993,7 @@ CosTrading::Register::OfferInfo *
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 describe (const char *id,
           CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
                   CosTrading::Register::ProxyOfferId))
@@ -1028,7 +1028,7 @@ modify (const char *id,
         const CosTrading::PropertyNameSeq& del_list,
         const CosTrading::PropertySeq& modify_list,
         CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1085,7 +1085,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_using_constraint (const char *type,
                            const char *constr,
                            CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTrading::IllegalConstraint,
@@ -1156,7 +1156,7 @@ CosTrading::Register_ptr
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 resolve (const CosTrading::TraderName &name,
          CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::IllegalTraderName,
                   CosTrading::Register::UnknownTraderName,
                   CosTrading::Register::RegisterNotSupported))
@@ -1222,7 +1222,7 @@ validate_properties (const char* type,
                      const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
                      const CosTrading::PropertySeq& properties,
                      CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::PropertyTypeMismatch,
                   CosTrading::ReadonlyDynamicProperty,
                   CosTrading::MissingMandatoryProperty,
@@ -1337,7 +1337,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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0);
 
@@ -1360,7 +1360,7 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_search_card (CORBA::ULong value,
                      CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().def_search_card ();
@@ -1374,7 +1374,7 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_search_card (CORBA::ULong value,
                      CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_search_card ();
@@ -1388,7 +1388,7 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_match_card (CORBA::ULong value,
                     CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().def_match_card ();
@@ -1402,7 +1402,7 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_match_card (CORBA::ULong value,
                     CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_match_card ();
@@ -1416,7 +1416,7 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_return_card (CORBA::ULong value,
                      CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().def_return_card ();
@@ -1430,7 +1430,7 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_return_card (CORBA::ULong value,
                      CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_return_card ();
@@ -1444,7 +1444,7 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_list (CORBA::ULong value,
               CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_list ();
@@ -1458,7 +1458,7 @@ CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_modifiable_properties (CORBA::Boolean value,
                                     CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
     this->trader_.support_attributes ().supports_modifiable_properties ();
@@ -1472,7 +1472,7 @@ CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_dynamic_properties (CORBA::Boolean value,
                                  CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
     this->trader_.support_attributes ().supports_dynamic_properties ();
@@ -1486,7 +1486,7 @@ CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_proxy_offers (CORBA::Boolean value,
                            CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
     this->trader_.support_attributes ().supports_proxy_offers ();
@@ -1500,7 +1500,7 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_hop_count (CORBA::ULong value,
                    CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().def_hop_count ();
@@ -1514,7 +1514,7 @@ CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_hop_count (CORBA::ULong value,
                    CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
     this->trader_.import_attributes ().max_hop_count ();
@@ -1528,7 +1528,7 @@ CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_follow_policy (CosTrading::FollowOption policy,
                        CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
     this->trader_.import_attributes ().def_follow_policy ();
@@ -1542,7 +1542,7 @@ CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_follow_policy (CosTrading::FollowOption policy,
                        CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
     this->trader_.import_attributes ().max_follow_policy ();
@@ -1556,7 +1556,7 @@ CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_link_follow_policy (CosTrading::FollowOption policy,
                             CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
     this->trader_.link_attributes ().max_link_follow_policy ();
@@ -1570,7 +1570,7 @@ CosTrading::TypeRepository_ptr
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_type_repos (CosTrading::TypeRepository_ptr repository,
                 CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::TypeRepository_ptr return_value =
     this->trader_.support_attributes ().type_repos ();
@@ -1584,7 +1584,7 @@ CosTrading::Admin::OctetSeq*
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_request_id_stem (const CosTrading::Admin::OctetSeq& stem,
                        CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, &this->stem_id_);
   this->stem_id_ = stem;
@@ -1598,7 +1598,7 @@ list_offers (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))
+  TAO_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()))
@@ -1630,7 +1630,7 @@ 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,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented))
 {
   TAO_THROW (CosTrading::NotImplemented ());
@@ -1662,7 +1662,7 @@ add_link (const char *name,
           CosTrading::FollowOption def_pass_on_follow_rule,
           CosTrading::FollowOption limiting_follow_rule,
           CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::DuplicateLinkName,
                   CosTrading::InvalidLookupRef,
@@ -1712,7 +1712,7 @@ void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 remove_link (const char *name,
              CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::UnknownLinkName))
 {
@@ -1733,7 +1733,7 @@ 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& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName))
 {
@@ -1772,7 +1772,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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate space for the link names.
   CORBA::ULong size = this->links_.current_size (), i = 0;
@@ -1796,7 +1796,7 @@ modify_link (const char *name,
              CosTrading::FollowOption def_pass_on_follow_rule,
              CosTrading::FollowOption limiting_follow_rule,
              CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
+  TAO_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName,
                    CosTrading::Link::DefaultFollowTooPermissive,
                    CosTrading::Link::LimitingFollowTooPermissive))
@@ -1857,7 +1857,7 @@ export_proxy (CosTrading::Lookup_ptr target,
               const char * recipe,
               const CosTrading::PolicySeq& policies_to_pass_on,
               CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
                   CosTrading::InvalidLookupRef,
@@ -1877,7 +1877,7 @@ void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_proxy (const char *id,
                 CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
                   CosTrading::Proxy::NotProxyOfferId))
@@ -1890,7 +1890,7 @@ CosTrading::Proxy::ProxyInfo *
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 describe_proxy (const char *id,
                 CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
                   CosTrading::Proxy::NotProxyOfferId))
@@ -1905,7 +1905,7 @@ list_proxies (CORBA::ULong how_many,
                 CosTrading::OfferIdSeq*& ids,
                 CosTrading::OfferIdIterator_ptr& id_itr,
                 CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
   TAO_THROW (CORBA::UNKNOWN ());
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 00561a27cf0..6faa9fbc600 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -68,7 +68,7 @@ public:
            CosTrading::OfferIterator_out offer_itr,
            CosTrading::PolicyNameSeq_out limits_applied,
            CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
                     CosTrading::IllegalConstraint,
@@ -191,7 +191,7 @@ private:
                         CosTrading::OfferSeq& offers,
                         CosTrading::OfferIterator_ptr& offer_itr,
                         CORBA::Environment& env)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                     CosTrading::DuplicatePropertyName));
   // This method takes the list of ordered offers and places a number
   // of them in the sequence of returned offers and the rest into thr
@@ -210,7 +210,7 @@ private:
                       CosTrading::OfferIterator_out offer_itr,
                       CosTrading::PolicyNameSeq_out limits_applied,
                       CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTrading::IllegalConstraint,
@@ -228,7 +228,7 @@ private:
                                  CORBA::ULong offer_returned,
                                  CosTrading::LinkNameSeq_out links,
                                  CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
   // Assemble a sequence of links that the federate_query method
   // should follow. Use the starting_trader policy, if one's provided,
@@ -248,7 +248,7 @@ private:
                         CosTrading::OfferIterator_ptr& offer_itr,
                         CosTrading::PolicyNameSeq& limits_applied,
                         CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTrading::IllegalConstraint,
@@ -270,7 +270,7 @@ private:
   CORBA::Boolean seen_request_id (TAO_Policies& policies,
                                   CosTrading::Admin::OctetSeq*& seq,
                                   CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
 
   // = Disallow these operations.
@@ -314,7 +314,7 @@ public:
                                            const char *type,
                                            const CosTrading::PropertySeq& properties,
                                            CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Register::InvalidObjectRef,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
@@ -380,7 +380,7 @@ public:
   // END SPEC
 
   virtual void withdraw (const char *id, CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
@@ -401,7 +401,7 @@ public:
   virtual CosTrading::Register::OfferInfo*
     describe (const char * id,
               CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
@@ -424,7 +424,7 @@ public:
                        const CosTrading::PropertyNameSeq& del_list,
                        const CosTrading::PropertySeq& modify_list,
                        CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -493,7 +493,7 @@ public:
   virtual void withdraw_using_constraint (const char *type,
                                           const char *constr,
                                           CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTrading::IllegalConstraint,
@@ -525,7 +525,7 @@ public:
   virtual CosTrading::Register_ptr
     resolve (const CosTrading::TraderName &name,
              CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::IllegalTraderName,
                      CosTrading::Register::UnknownTraderName,
                      CosTrading::Register::RegisterNotSupported));
@@ -559,7 +559,7 @@ public:
                             const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
                             const CosTrading::PropertySeq& properties,
                             CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::PropertyTypeMismatch,
                      CosTrading::ReadonlyDynamicProperty,
                      CosTrading::MissingMandatoryProperty,
@@ -615,47 +615,47 @@ public:
 
   virtual CORBA::ULong set_def_search_card (CORBA::ULong value,
                                             CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_search_card (CORBA::ULong value,
                                             CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // search card is the cardinality of the offers searched for
   // constraint compliance.
 
 
   virtual CORBA::ULong set_def_match_card (CORBA::ULong value,
                                             CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_match_card (CORBA::ULong value,
                                             CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // match card is the cardinality of offers found compliant with the
   // constraints.
 
   virtual CORBA::ULong set_def_return_card (CORBA::ULong value,
                                             CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_return_card (CORBA::ULong value,
                                             CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // return card is the cardinality of the offers returned from
   // Lookup.
 
   virtual CORBA::ULong set_max_list (CORBA::ULong value,
                                      CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
     set_supports_modifiable_properties (CORBA::Boolean value,
                                         CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
     set_supports_dynamic_properties (CORBA::Boolean value,
                                      CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
     set_supports_proxy_offers (CORBA::Boolean value,
                                CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Types of offers available for consideration. Ween out those
   // offers with modifiable properties
 
@@ -663,45 +663,45 @@ public:
 
   virtual CORBA::ULong set_def_hop_count (CORBA::ULong value,
                                           CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_hop_count (CORBA::ULong value,
                                           CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::FollowOption
     set_def_follow_policy (CosTrading::FollowOption policy,
                            CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
     set_max_follow_policy (CosTrading::FollowOption policy,
                            CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
     set_max_link_follow_policy (CosTrading::FollowOption policy,
                                 CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   // = Set Type Repository
 
   virtual CosTrading::TypeRepository_ptr
     set_type_repos (CosTrading::TypeRepository_ptr repository,
                     CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
     request_id_stem (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
     set_request_id_stem (const CosTrading::Admin::OctetSeq& stem,
                          CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual void list_offers (CORBA::ULong how_many,
                             CosTrading::OfferIdSeq_out ids,
                             CosTrading::OfferIdIterator_out id_itr,
                             CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
 
@@ -727,7 +727,7 @@ public:
                              CosTrading::OfferIdSeq_out,
                              CosTrading::OfferIdIterator_out,
                              CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
 private:
@@ -768,7 +768,7 @@ public:
                          CosTrading::FollowOption def_pass_on_follow_rule,
                          CosTrading::FollowOption limiting_follow_rule,
                          CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::DuplicateLinkName,
                     CosTrading::InvalidLookupRef,
@@ -817,7 +817,7 @@ public:
 
   virtual void remove_link (const char *name,
                             CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
 
@@ -834,7 +834,7 @@ public:
 
   virtual CosTrading::Link::LinkInfo* describe_link (const char *name,
                                                      CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
 
@@ -862,7 +862,7 @@ public:
   // END SPEC
 
   virtual CosTrading::LinkNameSeq* list_links (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
   // The list_links operation returns a list of the names of all
@@ -875,7 +875,7 @@ public:
                             CosTrading::FollowOption def_pass_on_follow_rule,
                             CosTrading::FollowOption limiting_follow_rule,
                             CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
+    TAO_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName,
                     CosTrading::Link::DefaultFollowTooPermissive,
                     CosTrading::Link::LimitingFollowTooPermissive));
@@ -949,7 +949,7 @@ public:
                   const char *,
                   const CosTrading::PolicySeq &,
                   CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
                     CosTrading::InvalidLookupRef,
@@ -963,7 +963,7 @@ public:
 
   virtual void withdraw_proxy (const char *,
                                CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
                     CosTrading::Proxy::NotProxyOfferId));
@@ -971,7 +971,7 @@ public:
   virtual CosTrading::Proxy::ProxyInfo *
   describe_proxy (const char *,
                   CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
                     CosTrading::Proxy::NotProxyOfferId));
@@ -982,7 +982,7 @@ public:
                              CosTrading::OfferIdSeq *&,
                              CosTrading::OfferIdIterator_ptr &,
                              CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::NotImplemented));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 962fb11863a..cdebf4d772f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -136,35 +136,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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Link::_duplicate (this->comps_.link_if ());
 }
@@ -177,28 +177,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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ());
 }
@@ -212,77 +212,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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_return_card ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::max_list (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_list ();
 }
 
 template <class IF> CORBA::ULong
 TAO_Import_Attributes<IF>::def_hop_count (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_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_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_follow_policy ();
 }
@@ -296,7 +296,7 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
 
 template <class IF> CosTrading::FollowOption
 TAO_Link_Attributes<IF>::max_link_follow_policy (CORBA::Environment &env)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_link_follow_policy ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index ca513621416..d91fc18542a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -104,27 +104,27 @@ public:
 
   // = CosTrading::TraderComponents methods.
   virtual CosTrading::Lookup_ptr lookup_if (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns an object reference to the Lookup interface of the trader.
   // Returns nil if the trader does not support Lookup interface.
 
   virtual CosTrading::Register_ptr register_if (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Register interface of the trader.
   // Returns nil if the trader does not support Register interface.
 
   virtual CosTrading::Link_ptr link_if (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Link interface of the trader.
   // Returns nil if the trader does not support Link interface.
 
   virtual CosTrading::Proxy_ptr proxy_if (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference to the Proxy interface of the trader.
   // Returns nil if the trader does not support Proxy interface.
 
   virtual CosTrading::Admin_ptr admin_if (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Admin interface of the trader.
   // Returns nil if the trader does not support Admin interface.
 
@@ -143,16 +143,16 @@ public:
   // = CosTrading::SupportAttributes methods.
 
   virtual CORBA::Boolean supports_modifiable_properties (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean supports_dynamic_properties (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean supports_proxy_offers (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::TypeRepository_ptr type_repos (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
@@ -169,47 +169,47 @@ public:
   // = CosTrading::ImportAttributes methods.
 
   virtual CORBA::ULong def_search_card (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong max_search_card (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   // Search cardinality determines the maximum number of offers searched
   // before not considering other offers.
 
   virtual CORBA::ULong def_match_card (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong max_match_card (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   // Match cardinality determines the maximum number of offers
   // matched to the constraints before not considering other offers..
 
   virtual CORBA::ULong def_return_card (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong max_return_card (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   // Return cardinality determines the maximum number of offers marked
   // to return before not considering other offers.
 
 
   virtual CORBA::ULong max_list (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong def_hop_count (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong max_hop_count (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::FollowOption def_follow_policy (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::FollowOption max_follow_policy (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
 
 private:
@@ -226,7 +226,7 @@ public:
 
   // = CosTrading::LinkAttributes methods
   virtual CosTrading::FollowOption max_link_follow_policy (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index fe50b9767f8..04899637bdf 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -253,7 +253,7 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
 CORBA::Any*
 TAO_Property_Evaluator::property_value (int index,
                                         CORBA::Environment& TAO_IN_ENV)
-    ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
+    TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* prop_val = 0;
   CORBA::Boolean in_cache =
@@ -342,7 +342,7 @@ TAO_Property_Evaluator_By_Name::
 TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
                                 CORBA::Environment& TAO_IN_ENV,
                                 CORBA::Boolean supports_dp)
-  ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
+  TAO_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                    CosTrading::IllegalPropertyName))
     : TAO_Property_Evaluator (properties, supports_dp)
 {
@@ -393,7 +393,7 @@ is_dynamic_property(const char* property_name)
 CORBA::Any*
 TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
                                                 CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
+  TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   int index = 0;
   CORBA::Any* prop_value = 0;
@@ -465,11 +465,11 @@ construct_dynamic_prop (const char* name,
           this->_remove_ref (TAO_TRY_ENV);
           TAO_CHECK_ENV;
         }
-
+      
       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;
     }
@@ -491,11 +491,11 @@ TAO_Dynamic_Property::destroy (void)
         {
           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;
         }
@@ -503,7 +503,7 @@ TAO_Dynamic_Property::destroy (void)
   TAO_CATCHANY
     {
     }
-  TAO_ENDTRY;
+  TAO_ENDTRY;  
 }
 
   // *************************************************************
@@ -528,7 +528,7 @@ const char* TAO_Policies::POLICY_NAMES[] =
 TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
                             const CosTrading::PolicySeq& policies,
                             CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
+  TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                   CosTrading::DuplicatePolicyName))
   : trader_ (trader)
 {
@@ -600,7 +600,7 @@ TAO_Policies::~TAO_Policies (void)
 CORBA::ULong
 TAO_Policies::ulong_prop (POLICY_TYPE pol,
                           CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::ULong return_value = 0, max_value = 0;
   const TAO_Import_Attributes_i& import_attrs =
@@ -652,21 +652,21 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol,
 
 CORBA::ULong
 TAO_Policies::search_card (CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->ulong_prop (SEARCH_CARD, TAO_IN_ENV);
 }
 
 CORBA::ULong
 TAO_Policies::match_card (CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->ulong_prop (MATCH_CARD, TAO_IN_ENV);
 }
 
 CORBA::ULong
 TAO_Policies::return_card (CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->ulong_prop (RETURN_CARD, TAO_IN_ENV);
 }
@@ -674,7 +674,7 @@ TAO_Policies::return_card (CORBA::Environment& TAO_IN_ENV) const
 CORBA::Boolean
 TAO_Policies::boolean_prop (POLICY_TYPE pol,
                             CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean def_value = 1,
     return_value = 1;
@@ -724,28 +724,28 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol,
 
 CORBA::Boolean
 TAO_Policies::use_modifiable_properties (CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->boolean_prop (USE_MODIFIABLE_PROPERTIES, TAO_IN_ENV);
 }
 
 CORBA::Boolean
 TAO_Policies::use_dynamic_properties (CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->boolean_prop (USE_DYNAMIC_PROPERTIES, TAO_IN_ENV);
 }
 
 CORBA::Boolean
 TAO_Policies::use_proxy_offers (CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->boolean_prop (USE_PROXY_OFFERS, TAO_IN_ENV);
 }
 
 CORBA::Boolean
 TAO_Policies::exact_type_match (CORBA::Environment& TAO_IN_ENV) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->boolean_prop (EXACT_TYPE_MATCH, TAO_IN_ENV);
 }
@@ -753,7 +753,7 @@ TAO_Policies::exact_type_match (CORBA::Environment& TAO_IN_ENV) const
 
 CosTrading::TraderName*
 TAO_Policies::starting_trader (CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
   CosTrading::TraderName* trader_name = 0;
@@ -777,7 +777,7 @@ TAO_Policies::starting_trader (CORBA::Environment& TAO_IN_ENV) const
 
 CosTrading::FollowOption
 TAO_Policies::link_follow_rule (CORBA::Environment& TAO_IN_ENV) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::FollowOption return_value =
     this->trader_.import_attributes ().def_follow_policy ();
@@ -808,7 +808,7 @@ TAO_Policies::link_follow_rule (CORBA::Environment& TAO_IN_ENV) const
 CosTrading::FollowOption
 TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
                                 CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue,
                    CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName))
@@ -834,14 +834,14 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
 
 CORBA::ULong
 TAO_Policies::hop_count (CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   return this->ulong_prop (HOP_COUNT, TAO_IN_ENV);
 }
 
 CosTrading::Admin::OctetSeq*
 TAO_Policies::request_id (CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::Admin::OctetSeq* request_id = 0;
 
@@ -868,7 +868,7 @@ TAO_Policies::
 copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
                        const CosTrading::Link::LinkInfo& link_info,
                        CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
+  TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
@@ -1097,7 +1097,7 @@ void
 TAO_Offer_Modifier::
 delete_properties (const CosTrading::PropertyNameSeq& deletes,
                    CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
+  TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                   CosTrading::Register::MandatoryProperty,
                   CosTrading::IllegalPropertyName,
                   CosTrading::DuplicatePropertyName))
@@ -1137,7 +1137,7 @@ void
 TAO_Offer_Modifier::
 merge_properties (const CosTrading::PropertySeq& modifies,
                   CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName,
                    CosTrading::PropertyTypeMismatch,
                    CosTrading::ReadonlyDynamicProperty,
@@ -1417,7 +1417,7 @@ TAO_Offer_Filter::limits_applied (void)
 TAO_Property_Filter::
 TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
                      CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+  TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
   : policy_  (desired_props._d ())
 {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index 1770754512f..ead8aa6c008 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -70,7 +70,7 @@ public:
   // 0 when the index is out of bounds.
 
   CORBA::Any* property_value(int index, CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
+    TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   // Returns value of the property whose index is <index>. If the
   // property at that index is dynamic and the trader supports dynamic
@@ -135,7 +135,7 @@ public:
   TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
                                   CORBA::Environment& _env,
                                   CORBA::Boolean supports_dp = 1)
-    ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
+    TAO_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                      CosTrading::IllegalPropertyName));
 
   TAO_Property_Evaluator_By_Name(CosTrading::Offer& offer,
@@ -151,7 +151,7 @@ public:
 
   CORBA::Any* property_value(const char* property_name,
                              CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
+    TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   // This method is identical to its counterpart in
   // TAO_Property_Evaluator, except property_value first discovers the
@@ -194,12 +194,12 @@ public:
   virtual ~TAO_Dynamic_Property (void);
 
   void destroy (void);
-
+  
   virtual CORBA::Any* evalDP(const char* name,
                              CORBA::TypeCode_ptr returned_type,
                              const CORBA::Any& extra_info,
                              CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTradingDynamic::DPEvalFailure)) = 0;
   // Dynamic property evaluation call-back method.
 
@@ -263,7 +263,7 @@ public:
   TAO_Policies (TAO_Trader_Base& trader,
                 const CosTrading::PolicySeq& policies,
                 CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
+    TAO_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                      CosTrading::DuplicatePolicyName));
 
   // BEGIN SPEC
@@ -291,7 +291,7 @@ public:
   ~TAO_Policies (void);
 
   CORBA::ULong search_card (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
   // The "search_card" policy indicates to the trader the maximum
@@ -303,7 +303,7 @@ public:
   // END SPEC
 
   CORBA::ULong match_card (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
   // The "match_card" policy indicates to the trader the maximum
@@ -315,7 +315,7 @@ public:
   // END SPEC
 
   CORBA::ULong return_card (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
   // The "return_card" policy indicates to the trader the maximum
@@ -329,7 +329,7 @@ public:
   // = Offer consideration policies
 
   CORBA::Boolean use_modifiable_properties (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
   // The "use_modifiable_properties" policy indicates whether the
@@ -342,7 +342,7 @@ public:
   // END SPEC
 
   CORBA::Boolean use_dynamic_properties (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
   // The "use_dynamic_properties" policy indicates whether the trader
@@ -355,7 +355,7 @@ public:
   // END SPEC
 
   CORBA::Boolean use_proxy_offers (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
   // The "use_proxy_offers" policy indicates whether the trader should
@@ -367,7 +367,7 @@ public:
   // END SPEC
 
   CORBA::Boolean exact_type_match (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
   // The "exact_type_match" policy indicates to the trader whether the
@@ -379,7 +379,7 @@ public:
   // = Federated trader policies (not implemented yet)
 
   CosTrading::TraderName* starting_trader (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                     CosTrading::Lookup::InvalidPolicyValue));
   // BEGIN SPEC
   // The "starting_trader" policy facilitates the distribution of the
@@ -398,7 +398,7 @@ public:
   // END SPEC
 
   CosTrading::FollowOption link_follow_rule (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Determine the link follow policy for this query overall.
 
   // BEGIN SPEC
@@ -410,7 +410,7 @@ public:
 
   CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
                                              CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue,
                      CosTrading::Link::IllegalLinkName,
                      CosTrading::Link::UnknownLinkName));
@@ -424,7 +424,7 @@ public:
   //          trader.def_follow_policy)
 
   CORBA::ULong hop_count (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
   // The "hop_count" policy indicates to the trader the maximum number
@@ -439,7 +439,7 @@ public:
   // END SPEC
 
   CosTrading::Admin::OctetSeq* request_id (CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Return the request_id passed to the query method across a link to
   // another trader.
 
@@ -454,7 +454,7 @@ public:
   void copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
                               const CosTrading::Link::LinkInfo& link_info,
                               CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue));
   // Determine the link follow policy to pass down the link with <link_name>.
   // This method returns the link_follow_rule for a link whose name is
@@ -469,12 +469,12 @@ private:
 
   CORBA::ULong ulong_prop (POLICY_TYPE pol,
                            CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Reconclile a ULong property with its default.
 
   CORBA::Boolean boolean_prop (POLICY_TYPE pol,
                                CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
+    TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Reconcile a Boolean property with its debault.
 
   TAO_Policies (const TAO_Policies&);
@@ -594,7 +594,7 @@ public:
 
   void delete_properties (const CosTrading::PropertyNameSeq& deletes,
                           CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
+    TAO_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                     CosTrading::Register::MandatoryProperty,
                     CosTrading::IllegalPropertyName,
                     CosTrading::DuplicatePropertyName));
@@ -603,7 +603,7 @@ public:
 
   void merge_properties (const CosTrading::PropertySeq& modifies,
                          CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName,
                      CosTrading::PropertyTypeMismatch,
                      CosTrading::ReadonlyDynamicProperty,
@@ -754,7 +754,7 @@ public:
 
   TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
                        CORBA::Environment& env)
-    ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
+    TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
   // Verify that the specified properties are correct.
 
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
index 0453addfe49..a0ac2362b22 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
@@ -311,9 +311,9 @@ DEP_CPP_AVSTR=\
 	".\Trader\Trader.h"\

 	

 NODEP_CPP_AVSTR=\

-	"..\..\..\..\Property\CosPropertyService_i.h"\

-	"..\..\..\..\Property\CosPropertyService_i_T.cpp"\

-	"..\..\..\..\Property\CosPropertyService_i_T.h"\

+	"..\..\..\..\..\Property\CosPropertyService_i.h"\

+	"..\..\..\..\..\Property\CosPropertyService_i_T.cpp"\

+	"..\..\..\..\..\Property\CosPropertyService_i_T.h"\

 	".\AV\AVStreams_i_T.cpp"\

 	".\AV\AVStreams_i_T.h"\

 	

@@ -4586,9 +4586,9 @@ DEP_CPP_COSPR=\
 	".\orbsvcs_export.h"\

 	

 NODEP_CPP_COSPR=\

-	"..\..\..\..\Property\CosPropertyService_i.h"\

-	"..\..\..\..\Property\CosPropertyService_i_T.cpp"\

-	"..\..\..\..\Property\CosPropertyService_i_T.h"\

+	"..\..\..\..\..\Property\CosPropertyService_i.h"\

+	"..\..\..\..\..\Property\CosPropertyService_i_T.cpp"\

+	"..\..\..\..\..\Property\CosPropertyService_i_T.h"\

 	

 

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

@@ -8507,21 +8507,6 @@ NODEP_CPP_EC_GAT=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_MT_Dispatching.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\EC_Null_Factory.cpp

 

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

@@ -12947,9 +12932,9 @@ DEP_CPP_ENDPO=\
 	".\Trader\Trader.h"\

 	

 NODEP_CPP_ENDPO=\

-	"..\..\..\..\Property\CosPropertyService_i.h"\

-	"..\..\..\..\Property\CosPropertyService_i_T.cpp"\

-	"..\..\..\..\Property\CosPropertyService_i_T.h"\

+	"..\..\..\..\..\Property\CosPropertyService_i.h"\

+	"..\..\..\..\..\Property\CosPropertyService_i_T.cpp"\

+	"..\..\..\..\..\Property\CosPropertyService_i_T.h"\

 	".\AV\AVStreams_i_T.cpp"\

 	".\AV\AVStreams_i_T.h"\

 	

@@ -14195,7 +14180,7 @@ DEP_CPP_HASH_=\
 	".\Naming\Hash_Naming_Context.h"\

 	

 NODEP_CPP_HASH_=\

-	"..\..\..\..\Naming\Naming_Context.h"\

+	"..\..\..\..\..\Naming\Naming_Context.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

 	

@@ -17364,7 +17349,7 @@ NODEP_CPP_OFFER=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Context_Index.cpp

+SOURCE=.\Naming\Persistent_Bindings_Map.cpp

 

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

 

@@ -17658,7 +17643,7 @@ DEP_CPP_PERSI=\
 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

 	"..\..\tao\WrongTransactionC.h"\

-	".\Naming\Persistent_Context_Index.h"\

+	".\Naming\Persistent_Bindings_Map.h"\

 	".\Naming\Persistent_Entries.h"\

 	".\Naming\Shared_Hash_Map_T.cpp"\

 	".\Naming\Shared_Hash_Map_T.h"\

@@ -17675,7 +17660,7 @@ NODEP_CPP_PERSI=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Entries.cpp

+SOURCE=.\Naming\Persistent_Context_Index.cpp

 

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

 

@@ -17969,6 +17954,7 @@ DEP_CPP_PERSIS=\
 	"..\..\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"\

@@ -17985,7 +17971,7 @@ NODEP_CPP_PERSIS=\
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Naming_Context.cpp

+SOURCE=.\Naming\Persistent_Entries.cpp

 

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

 

@@ -18007,6 +17993,316 @@ DEP_CPP_PERSIST=\
 	"..\..\..\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_PERSIST=\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Naming\Persistent_Naming_Context.cpp

+

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

+

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

+

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

+

+DEP_CPP_PERSISTE=\

+	"..\..\..\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"\

@@ -18282,17 +18578,17 @@ DEP_CPP_PERSIST=\
 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

 	"..\..\tao\WrongTransactionC.h"\

+	".\Naming\Persistent_Bindings_Map.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"\

+NODEP_CPP_PERSISTE=\

+	"..\..\..\..\..\Naming\Naming_Context.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	".\Naming\Persistent_Bindings_Map.h"\

 	

 

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

@@ -23413,7 +23709,7 @@ DEP_CPP_TAO_T=\
 	".\Time\Timer_Helper.h"\

 	

 NODEP_CPP_TAO_T=\

-	"..\..\..\..\Naming\Naming_Context.h"\

+	"..\..\..\..\..\Naming\Naming_Context.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

 	

@@ -24958,7 +25254,7 @@ DEP_CPP_TIMER=\
 	".\Time\Timer_Helper.h"\

 	

 NODEP_CPP_TIMER=\

-	"..\..\..\..\Naming\Naming_Context.h"\

+	"..\..\..\..\..\Naming\Naming_Context.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

 	

@@ -25888,21 +26184,6 @@ NODEP_CPP_TRADER=\
 !ENDIF 

 

 # End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Transient_Naming_Context.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -25933,10 +26214,6 @@ SOURCE=.\Event\BCU.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Bindings_Iterator_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Concurrency\CC_LockSet.h

 # End Source File

 # Begin Source File

@@ -26117,10 +26394,6 @@ SOURCE=.\Event\EC_Gateway_UDP.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_MT_Dispatching.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\EC_Null_Factory.h

 # End Source File

 # Begin Source File

@@ -26313,10 +26586,18 @@ SOURCE=.\Trader\Offer_Iterators_T.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Persistent_Bindings_Map.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Naming\Persistent_Context_Index.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Persistent_Context_Index_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Naming\Persistent_Entries.h

 # End Source File

 # Begin Source File

@@ -26479,10 +26760,6 @@ SOURCE=.\Trader\Trader_T.h
 

 SOURCE=.\Trader\Trader_Utils.h

 # End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Transient_Naming_Context.h

-# End Source File

 # End Group

 # Begin Group "Inline Files"

 

@@ -26609,10 +26886,6 @@ SOURCE=.\Event\EC_Filter_Builder.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_MT_Dispatching.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\EC_Null_Factory.i

 # End Source File

 # Begin Source File

@@ -26789,7 +27062,7 @@ InputName=AVStreams
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -26829,7 +27102,7 @@ InputName=AVStreams
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -26869,7 +27142,7 @@ InputName=AVStreams
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -26909,7 +27182,7 @@ InputName=AVStreams
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -26956,7 +27229,7 @@ InputName=CosConcurrencyControl
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -26996,7 +27269,7 @@ InputName=CosConcurrencyControl
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27036,7 +27309,7 @@ InputName=CosConcurrencyControl
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27076,7 +27349,7 @@ InputName=CosConcurrencyControl
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27123,7 +27396,7 @@ InputName=CosEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27163,7 +27436,7 @@ InputName=CosEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27203,7 +27476,7 @@ InputName=CosEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27243,7 +27516,7 @@ InputName=CosEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27290,7 +27563,7 @@ InputName=CosEventComm
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27330,7 +27603,7 @@ InputName=CosEventComm
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27370,7 +27643,7 @@ InputName=CosEventComm
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27410,7 +27683,7 @@ InputName=CosEventComm
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27457,7 +27730,7 @@ InputName=CosLifeCycle
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27497,7 +27770,7 @@ InputName=CosLifeCycle
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27537,7 +27810,7 @@ InputName=CosLifeCycle
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27577,7 +27850,7 @@ InputName=CosLifeCycle
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27624,7 +27897,7 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27664,7 +27937,7 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27704,7 +27977,7 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27744,7 +28017,7 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27791,7 +28064,7 @@ InputName=CosPropertyService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27831,7 +28104,7 @@ InputName=CosPropertyService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27871,7 +28144,7 @@ InputName=CosPropertyService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27911,7 +28184,7 @@ InputName=CosPropertyService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27958,7 +28231,7 @@ InputName=CosTrading
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27998,7 +28271,7 @@ InputName=CosTrading
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28038,7 +28311,7 @@ InputName=CosTrading
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28078,7 +28351,7 @@ InputName=CosTrading
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28125,7 +28398,7 @@ InputName=CosTradingDynamic
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28165,7 +28438,7 @@ InputName=CosTradingDynamic
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28205,7 +28478,7 @@ InputName=CosTradingDynamic
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28245,7 +28518,7 @@ InputName=CosTradingDynamic
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28292,7 +28565,7 @@ InputName=CosTradingRepos
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28332,7 +28605,7 @@ InputName=CosTradingRepos
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28372,7 +28645,7 @@ InputName=CosTradingRepos
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28412,7 +28685,7 @@ InputName=CosTradingRepos
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28459,7 +28732,7 @@ InputName=ImplRepo
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28499,7 +28772,7 @@ InputName=ImplRepo
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28539,7 +28812,7 @@ InputName=ImplRepo
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28579,7 +28852,7 @@ InputName=ImplRepo
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28626,7 +28899,7 @@ InputName=LifeCycleService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28666,7 +28939,7 @@ InputName=LifeCycleService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28706,7 +28979,7 @@ InputName=LifeCycleService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28746,7 +29019,7 @@ InputName=LifeCycleService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28793,7 +29066,7 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28833,7 +29106,7 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28873,7 +29146,7 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28913,7 +29186,7 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28960,7 +29233,7 @@ InputName=Null_MediaCtrl
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29000,7 +29273,7 @@ InputName=Null_MediaCtrl
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29040,7 +29313,7 @@ InputName=Null_MediaCtrl
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29080,7 +29353,7 @@ InputName=Null_MediaCtrl
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29127,7 +29400,7 @@ InputName=Ping
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29167,7 +29440,7 @@ InputName=Ping
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29207,7 +29480,7 @@ InputName=Ping
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29247,7 +29520,7 @@ InputName=Ping
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29294,7 +29567,7 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29334,7 +29607,7 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29374,7 +29647,7 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29414,7 +29687,7 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29461,7 +29734,7 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29501,7 +29774,7 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29541,7 +29814,7 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29581,7 +29854,7 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29628,7 +29901,7 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29668,7 +29941,7 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29708,7 +29981,7 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29748,7 +30021,7 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29795,7 +30068,7 @@ InputName=RtecUDPAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29835,7 +30108,7 @@ InputName=RtecUDPAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29875,7 +30148,7 @@ InputName=RtecUDPAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29915,7 +30188,7 @@ InputName=RtecUDPAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29962,7 +30235,7 @@ InputName=sfp
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30002,7 +30275,7 @@ InputName=sfp
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30042,7 +30315,7 @@ InputName=sfp
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30082,7 +30355,7 @@ InputName=sfp
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30129,7 +30402,7 @@ InputName=TimeBase
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30168,10 +30441,10 @@ InputPath=.\TimeBase.idl
 InputName=TimeBase

 

 BuildCmds= \

-	..\..\..\bin\tao_idl                  -I../../ \

-                     -Wb,export_macro=TAO_ORBSVCS_Export \

-                                                                -Wb,export_include=orbsvcs_export.h                  $(InputName).idl \

-                   -I..\..\ 

+	..\..\..\bin\tao_idl                -I../../ \

+                  -Wb,export_macro=TAO_ORBSVCS_Export \

+                                                             -Wb,export_include=orbsvcs_export.h                $(InputName).idl \

+                -I..\..\ 

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30211,7 +30484,7 @@ InputName=TimeBase
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30251,7 +30524,7 @@ InputName=TimeBase
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30298,7 +30571,7 @@ InputName=TimeService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-         -Wb,export_include=orbsvcs_export.h $(InputName).idl

+        -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30338,7 +30611,7 @@ InputName=TimeService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30378,7 +30651,7 @@ InputName=TimeService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30418,7 +30691,7 @@ InputName=TimeService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                                -Wb,export_include=orbsvcs_export.h $(InputName).idl

+                                               -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30564,6 +30837,11 @@ SOURCE=.\Trader\Offer_Iterators_T.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Persistent_Context_Index_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

 SOURCE=.\Naming\Shared_Hash_Map_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
index 0582192aa83..15cc11ca44b 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
@@ -292,10 +292,6 @@ SOURCE=.\Event\EC_Gateway_UDP.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_MT_Dispatching.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\EC_Null_Factory.cpp

 # End Source File

 # Begin Source File

@@ -476,6 +472,10 @@ SOURCE=.\Trader\Offer_Iterators.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Persistent_Bindings_Map.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Naming\Persistent_Context_Index.cpp

 # End Source File

 # Begin Source File

@@ -642,10 +642,6 @@ SOURCE=.\Trader\Trader.cpp
 

 SOURCE=.\Trader\Trader_Utils.cpp

 # End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Transient_Naming_Context.cpp

-# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -656,10 +652,6 @@ SOURCE=.\Event\BCU.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Bindings_Iterator_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Concurrency\CC_LockSet.h

 # End Source File

 # Begin Source File

@@ -844,10 +836,6 @@ SOURCE=.\Event\EC_Gateway_UDP.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_MT_Dispatching.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\EC_Null_Factory.h

 # End Source File

 # Begin Source File

@@ -1040,10 +1028,18 @@ SOURCE=.\Trader\Offer_Iterators_T.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Persistent_Bindings_Map.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Naming\Persistent_Context_Index.h

 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Persistent_Context_Index_T.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Naming\Persistent_Entries.h

 # End Source File

 # Begin Source File

@@ -1190,10 +1186,6 @@ SOURCE=.\Trader\Trader_T.h
 

 SOURCE=.\Trader\Trader_Utils.h

 # End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Transient_Naming_Context.h

-# End Source File

 # End Group

 # Begin Group "Inline Files"

 

@@ -1276,10 +1268,6 @@ SOURCE=.\Event\EC_Dispatching_Task.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_MT_Dispatching.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\EC_Null_Scheduling.i

 # End Source File

 # Begin Source File

@@ -1396,8 +1384,8 @@ InputName=AVStreams
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1437,7 +1425,7 @@ InputName=AVStreams
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1484,8 +1472,8 @@ InputName=CosConcurrencyControl
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1525,7 +1513,7 @@ InputName=CosConcurrencyControl
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1572,8 +1560,8 @@ InputName=CosEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1613,7 +1601,7 @@ InputName=CosEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1660,8 +1648,8 @@ InputName=CosEventComm
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1701,7 +1689,7 @@ InputName=CosEventComm
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1748,8 +1736,8 @@ InputName=CosLifeCycle
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1789,7 +1777,7 @@ InputName=CosLifeCycle
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1836,8 +1824,8 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1877,7 +1865,7 @@ InputName=CosNaming
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1924,8 +1912,8 @@ InputName=CosPropertyService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1965,7 +1953,7 @@ InputName=CosPropertyService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2012,8 +2000,8 @@ InputName=CosTrading
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2053,7 +2041,7 @@ InputName=CosTrading
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2100,8 +2088,8 @@ InputName=CosTradingDynamic
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2141,7 +2129,7 @@ InputName=CosTradingDynamic
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2188,8 +2176,8 @@ InputName=CosTradingRepos
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2229,7 +2217,7 @@ InputName=CosTradingRepos
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2276,8 +2264,8 @@ InputName=ImplRepo
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2317,7 +2305,7 @@ InputName=ImplRepo
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2364,8 +2352,8 @@ InputName=LifeCycleService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2405,7 +2393,7 @@ InputName=LifeCycleService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2452,8 +2440,8 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2493,7 +2481,7 @@ InputName=Logger
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2540,8 +2528,8 @@ InputName=Null_MediaCtrl
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2581,7 +2569,7 @@ InputName=Null_MediaCtrl
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2628,8 +2616,8 @@ InputName=Ping
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2669,7 +2657,7 @@ InputName=Ping
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2716,8 +2704,8 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2757,7 +2745,7 @@ InputName=RtecEventChannelAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2804,8 +2792,8 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2845,7 +2833,7 @@ InputName=RtecEventComm
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2892,8 +2880,8 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2933,7 +2921,7 @@ InputName=RtecScheduler
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2980,8 +2968,8 @@ InputName=RtecUDPAdmin
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3021,7 +3009,7 @@ InputName=RtecUDPAdmin
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3068,8 +3056,8 @@ InputName=sfp
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3109,7 +3097,7 @@ InputName=sfp
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3156,8 +3144,8 @@ InputName=TimeBase
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3197,7 +3185,7 @@ InputName=TimeBase
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3244,8 +3232,8 @@ InputName=TimeService
 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl_static -I../../\

-        -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-        $(InputName).idl

+       -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

+       $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3285,7 +3273,7 @@ InputName=TimeService
 

 BuildCmds= \

 	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-        -Wb,export_include=orbsvcs_export.h $(InputName).idl

+       -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3324,10 +3312,6 @@ BuildCmds= \
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\Naming\Bindings_Iterator_T.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosPropertyServiceS_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

@@ -3358,6 +3342,11 @@ SOURCE=.\Trader\Offer_Iterators_T.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\Persistent_Context_Index_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

 SOURCE=.\PingS_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.h b/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
index 46425206275..43640396ed2 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
@@ -13,7 +13,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Acceptor.h"
 #include "ace/Event_Handler.h"
 #include "ace/ARGV.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf b/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf
index 1241d240349..fe09c7a6f3c 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf
@@ -2,5 +2,5 @@
 #
 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() 
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
index 093cd2721a4..6e87920f5eb 100755
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 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
 
@@ -22,7 +21,7 @@ $nsport = 20000 + uniqueid ();
 sub name_server
 {
     my $args = "-ORBnameserviceport $nsport";
-    my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service "
+    my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service"
 	.$Process::EXE_EXT;
     print ("\nNaming_Service: $prog$Process::EXE_EXT $args\n");
     $NS = Process::Create ($prog, $args);
@@ -33,7 +32,7 @@ sub server
 {
     my $args = "-ORBnameserviceport $nsport";
     print ("\nServer: server$Process::EXE_EXT $args\n");
-    $SV = Process::Create ('.' . $DIR_SEPARATOR . "server " .$Process::EXE_EXT . $args);
+    $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", $args);
 }
 
 
@@ -41,7 +40,7 @@ sub client
 {
     my $args = "-ORBnameserviceport $nsport";
     print ("\nclient: client $args\n");
-    $CL = Process::Create ('.' . $DIR_SEPARATOR . "client " .$Process::EXE_EXT . $args);
+    $CL = Process::Create ($EXEPREFIX."client$Process::EXE_EXT", $args);
 }
 
 name_server ();
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
index 5f0ea44102a..52fbde787d4 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
@@ -1,8 +1,6 @@
-# $Id: svc.conf,v 1.
-6 1999/06/08 20:46:51 schmidt Exp $
+# $Id$
 #
-
+static Resource_Factory "-ORBresources global"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection"
-
+static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
index 7b853699390..a5a704c4cdc 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
-static Resource_Factory "-ORBResources global"
+static Resource_Factory "-ORBresources global"
 static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBSystemidPolicyDemuxStrategy dynamic -ORBTableSize 128"
+static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
index 10de97f7b43..e25db66486f 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
@@ -1,6 +1,6 @@
 # $Id$
 #
-static Resource_Factory "-ORBResources global"
+static Resource_Factory "-ORBresources global"
 static Client_Strategy_Factory ""
-###static Server_Strategy_Factory "-ORBConcurrency reactive -ORBSystemidPolicyDemuxStrategy dynamic -ORBTableSize 128"
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBSystemidPolicyDemuxStrategy dynamic -ORBTableSize 128"
+###static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 78ce7402c2a..c43f62fd4ad 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -19,7 +19,6 @@
 #include "CC_test_utils.h"
 #include "CC_naming_service.h"
 #include "ace/ACE.h"
-#include "ace/OS.h"
 #include "ace/Process.h"
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include <stdio.h>
@@ -47,7 +46,7 @@ CC_Command::GetLockSet(char *lock_set_name, CORBA::Environment &TAO_IN_ENV)
       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,
+            CC_naming_service::Instance()->get_obj_from_name ("", lock_set_name,
                                                               TAO_TRY_ENV);
           TAO_CHECK_ENV;
 
@@ -564,7 +563,7 @@ CC_Lookup_Cmd::execute(void)
       TAO_TRY
         {
           CORBA::Object_var ccls_obj =
-            CC_naming_service::Instance()->get_obj_from_name (ACE_const_cast (char *, ""), name_,
+            CC_naming_service::Instance()->get_obj_from_name ("", name_,
                                                               TAO_TRY_ENV);
           TAO_CHECK_ENV;
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 024655175f3..29945879d82 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -19,28 +19,27 @@
 
 #include "CC_test_utils.h"
 #include "CC_naming_service.h"
-#include "ace/OS.h"
 
 ACE_RCSID(Concurrency, CC_test_utils, "$Id$")
 
 char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
 {
   if (mode==CosConcurrencyControl::read)
-    return ACE_const_cast (char*, "read");
+    return "read";
 
   if (mode==CosConcurrencyControl::write)
-    return  ACE_const_cast (char*, "write");
+    return "write";
 
   if (mode==CosConcurrencyControl::upgrade)
-    return ACE_const_cast (char*, "upgrade");
+    return "upgrade";
 
   if (mode==CosConcurrencyControl::intention_read)
-    return ACE_const_cast (char*, "intention_read");
+    return "intention_read";
 
   if (mode==CosConcurrencyControl::intention_write)
-    return ACE_const_cast (char*, "intention_write");
+    return "intention_write";
 
-  return ACE_const_cast (char*, "unknown lock mode");
+  return "unknown lock mode";
 }
 
 CosConcurrencyControl::LockSet_ptr
@@ -49,23 +48,23 @@ CC_TestUtils::create_lock_set (void)
   // Create the lock set and return an obj ref corresponding to the
   // key.
   CosConcurrencyControl::LockSet_ptr lock_set(0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+
+  TAO_TRY
     {
       lock_set =
-        CC_naming_service::Instance()->get_lock_set_factory ()->create (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CC_naming_service::Instance()->get_lock_set_factory ()->create (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (lock_set))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "null lock set objref returned by factory\n"),
                           0);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("CC_Client::create_lock_set");
+      TAO_TRY_ENV.print_exception ("CC_Client::create_lock_set");
       return 0;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return lock_set;
 }
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 46939a5fc8c..51559e3e385 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -18,7 +18,7 @@
 // ============================================================================
 
 #include "CC_tests.h"
-#include "ace/OS.h"
+
 ACE_RCSID(Concurrency, CC_tests, "$Id$")
 
 CC_Test::CC_Test (CC_naming_service *ns)
@@ -37,24 +37,24 @@ CC_Test::create_lock_set (void)
   // Create the lock set and return an obj ref corresponding to the
   // key.
   CosConcurrencyControl::LockSet_ptr lock_set(0);
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+
+  TAO_TRY
     {
       lock_set =
-        this->naming_service_->get_lock_set_factory ()->create (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->naming_service_->get_lock_set_factory ()->create (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (lock_set))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "null lock set objref returned by factory\n"),
                           0);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("CC_Client::create_lock_set");
+      TAO_TRY_ENV.print_exception ("CC_Client::create_lock_set");
       return 0;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return lock_set;
 }
 
@@ -62,21 +62,21 @@ char *
 CC_Test::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
 {
   if (mode==CosConcurrencyControl::read)
-    return ACE_const_cast (char *, "read");
+    return "read";
 
   if (mode==CosConcurrencyControl::write)
-    return ACE_const_cast (char *, "write");
+    return "write";
 
   if (mode==CosConcurrencyControl::upgrade)
-    return ACE_const_cast (char *, "upgrade");
+    return "upgrade";
 
   if (mode==CosConcurrencyControl::intention_read)
-    return ACE_const_cast (char *, "intension_read");
+    return "intension_read";
 
   if (mode==CosConcurrencyControl::intention_write)
-    return ACE_const_cast (char *, "intension_write");
+    return "intension_write";
 
-  return ACE_const_cast (char *, "unknown lock mode");
+  return "unknown lock mode";
 }
 
 // ================================
@@ -100,19 +100,17 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
 
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      cc_lock_set_->lock (mode_, ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
+      cc_lock_set_->lock (mode_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock set\n",
                   get_lock_mode_name (mode_)));
 
       lock_not_held = cc_lock_set_->try_lock (mode_,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (lock_not_held)
         {
@@ -127,14 +125,14 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
                     get_lock_mode_name (mode_)));
 
       cc_lock_set_->unlock (mode_,
-                            ACE_TRY_ENV);
+                            TAO_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
       lock_not_held = cc_lock_set_->try_lock (mode_,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (lock_not_held)
         ACE_DEBUG ((LM_DEBUG,
@@ -149,12 +147,12 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
         }
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Test_Single_Lock_With_Mode::run");
+      TAO_TRY_ENV.print_exception ("Test_Single_Lock_With_Mode::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   CORBA::release (cc_lock_set_);
 
@@ -177,31 +175,30 @@ Test_Setup_LockSet::~Test_Setup_LockSet (void)
 int
 Test_Setup_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CosConcurrencyControl::LockSet_ptr cc_lock_set_ =
         create_lock_set ();
       this->naming_service_->bind_name (my_name_, cc_lock_set_,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Name bound\n"));
 
       cc_lock_set_->lock (CosConcurrencyControl::read,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Read lock set\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Test_Against_Other_LockSet::run");
+      TAO_TRY_ENV.print_exception ("Test_Against_Other_LockSet::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return CC_SUCCESS;
 }
@@ -223,31 +220,30 @@ Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void)
 int
 Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::Object_var ccls_obj =
-        this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""),
+        this->naming_service_->get_obj_from_name ("",
                                                   my_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;
 
       ccls->lock (CosConcurrencyControl::read,
-                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Test_Against_Other_LockSet::run");
+      TAO_TRY_ENV.print_exception ("Test_Against_Other_LockSet::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return CC_SUCCESS;
 }
@@ -269,28 +265,27 @@ Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void)
 int
 Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::Object_var ccls_obj =
-        this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), my_name_,
-                                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->naming_service_->get_obj_from_name ("", my_name_,
+                                                 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;
 
       ccls->unlock (CosConcurrencyControl::read,
-                    ACE_TRY_ENV);
+                    TAO_TRY_ENV);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Test_Unlock_Already_Created_LockSet::run");
+      TAO_TRY_ENV.print_exception ("Test_Unlock_Already_Created_LockSet::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return CC_SUCCESS;
 }
@@ -315,18 +310,18 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
 
   // Create the lock set
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+
+  TAO_TRY
     {
       // lock the lock
-      cc_lock_set_->lock (mode_, ACE_TRY_ENV);
+      cc_lock_set_->lock (mode_, TAO_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock set\n",
                   get_lock_mode_name (mode_)));
 
       // check to see if the lock is held
       lock_not_held = cc_lock_set_->try_lock (mode_,
-                                              ACE_TRY_ENV);
+                                              TAO_TRY_ENV);
 
       if (lock_not_held)
         {
@@ -342,22 +337,22 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
 
       // release the lock
       cc_lock_set_->unlock (mode_,
-                            ACE_TRY_ENV);
+                            TAO_TRY_ENV);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
       // release the lock again. this should raise an exception
       cc_lock_set_->unlock (mode_,
-                            ACE_TRY_ENV);
+                            TAO_TRY_ENV);
 
       ACE_DEBUG ((LM_DEBUG,
                   "attemptet to release %s lock\n",
                   get_lock_mode_name (mode_)));
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH(CosConcurrencyControl::LockNotHeld, userex)
+  TAO_CATCH(CosConcurrencyControl::LockNotHeld, userex)
     {
       // We should end here
       ACE_UNUSED_ARG (userex);
@@ -365,12 +360,12 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
       return CC_SUCCESS;
     }
 
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Test_Release_Not_Held_Lock::run");
+      TAO_TRY_ENV.print_exception ("Test_Release_Not_Held_Lock::run");
       return CC_FAIL;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   CORBA::release (cc_lock_set_);
 
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile
index 5d8b7cc925a..b7b9b49ca90 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile
@@ -264,7 +264,18 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -284,25 +295,14 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_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/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 \
@@ -318,8 +318,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -358,7 +357,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -543,7 +541,18 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -563,25 +572,14 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_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/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 \
@@ -597,8 +595,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -637,7 +634,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -821,7 +817,18 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -841,25 +848,14 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_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/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 \
@@ -875,8 +871,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -915,7 +910,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -1099,7 +1093,18 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1119,25 +1124,14 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_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/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 \
@@ -1153,8 +1147,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1193,7 +1186,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -1354,7 +1346,18 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1374,25 +1377,14 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_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/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 \
@@ -1408,8 +1400,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1448,7 +1439,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -1610,7 +1600,18 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1630,25 +1631,14 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_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/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 \
@@ -1664,8 +1654,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1704,7 +1693,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -1866,7 +1854,18 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1886,25 +1885,14 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_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/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 \
@@ -1920,8 +1908,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1960,7 +1947,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
@@ -2146,7 +2132,18 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2166,25 +2163,14 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_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/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 \
@@ -2200,8 +2186,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2240,7 +2225,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/Makefile b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
index da01784bb1a..766decf96cb 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
@@ -192,7 +192,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -212,25 +223,14 @@ 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 \
- $(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/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 \
@@ -246,8 +246,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -286,7 +285,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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 \
@@ -552,7 +550,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -572,25 +581,14 @@ 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 \
- $(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/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 \
@@ -606,8 +604,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -646,7 +643,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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 \
@@ -819,7 +815,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -839,25 +846,14 @@ 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 \
- $(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/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 \
@@ -873,8 +869,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -913,7 +908,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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 \
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
index 92525ef2d77..d1573010bc1 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
@@ -219,7 +219,18 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -239,25 +250,14 @@ 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 \
- $(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/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 \
@@ -273,8 +273,7 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -313,7 +312,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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 \
@@ -498,7 +496,18 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -518,25 +527,14 @@ 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 \
- $(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/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 \
@@ -552,8 +550,7 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -592,7 +589,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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 \
@@ -788,7 +784,18 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -808,25 +815,14 @@ 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 \
- $(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/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 \
@@ -842,8 +838,7 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -882,7 +877,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
index 1186e323e2e..1a7ed58db81 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
@@ -301,7 +301,6 @@ ECB_Consumer::close (CORBA::Environment &TAO_IN_ENV)
 void
 ECB_Consumer::push (const RtecEventComm::EventSet& events,
                     CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->test_->push (this->consumer_id_,
                      events,
@@ -310,7 +309,6 @@ ECB_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 ECB_Consumer::disconnect_push_consumer (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -408,7 +406,6 @@ ECB_Supplier::send_event (RtecEventComm::EventSet& events,
 
 void
 ECB_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
   // this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
index 1ea8ce9f1aa..5ffa770d18e 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
@@ -123,10 +123,8 @@ public:
 
   // = The POA_RtecEventComm::PushComsumer 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));
+                     CORBA::Environment &_env);
+  virtual void disconnect_push_consumer (CORBA::Environment &);
 
 private:
   ECB_Test* test_;
@@ -178,8 +176,7 @@ public:
   // Send one event, the supplier provides the SourceID
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &);
 
 private:
   ECB_Test* test_;
diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile
index 14da57c2bf7..4e82996df0b 100644
--- a/TAO/orbsvcs/tests/EC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/EC_Basic/Makefile
@@ -194,7 +194,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -214,25 +225,14 @@ 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 \
- $(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/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 \
@@ -248,8 +248,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -288,7 +287,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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 \
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 35431480684..081c9c805de 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -440,7 +440,6 @@ Test_Consumer::disconnect (CORBA::Environment &TAO_IN_ENV)
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events,
                      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, TAO_IN_ENV);
@@ -448,7 +447,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 Test_Consumer::disconnect_push_consumer (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 07bb0856a0f..30cdaa86d40 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -42,10 +42,8 @@ public:
   // Disconnect from the EC.
 
   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));
+                     CORBA::Environment &_env);
+  virtual void disconnect_push_consumer (CORBA::Environment &);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index b21f12ec045..0255d64c8f4 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -523,7 +523,6 @@ Test_Supplier::svc ()
 
 void
 Test_Supplier::disconnect_push_supplier (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 261db73a419..e9e6c6459e6 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -47,8 +47,7 @@ public:
   void disconnect (CORBA::Environment &_env);
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &);
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index b9d0cb993a7..3825010198c 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -217,7 +217,18 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -237,25 +248,14 @@ 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 \
- $(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/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 \
@@ -271,8 +271,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -311,7 +310,6 @@ realclean:
  $(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 \
@@ -567,7 +565,18 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -587,25 +596,14 @@ 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 \
- $(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/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 \
@@ -621,8 +619,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -661,7 +658,6 @@ realclean:
  $(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 \
@@ -906,7 +902,18 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -926,25 +933,14 @@ 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 \
- $(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/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 \
@@ -960,8 +956,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1000,7 +995,6 @@ realclean:
  $(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 \
@@ -1159,7 +1153,18 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1179,25 +1184,14 @@ 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 \
- $(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/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 \
@@ -1213,8 +1207,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1253,7 +1246,6 @@ realclean:
  $(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 \
@@ -1416,7 +1408,18 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1433,25 +1436,14 @@ 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 \
- $(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/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 \
@@ -1467,8 +1459,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1507,7 +1498,6 @@ realclean:
  $(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 \
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 0a598f3e9e9..cd524449573 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -733,7 +733,6 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events,
 
 void
 ECM_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
 
@@ -841,7 +840,6 @@ ECM_Consumer::close (CORBA::Environment &TAO_IN_ENV)
 void
 ECM_Consumer::push (const RtecEventComm::EventSet& events,
                     CORBA::Environment &TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
   this->federation_->consumer_push (arrival, events, TAO_IN_ENV);
@@ -849,7 +847,6 @@ ECM_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 ECM_Consumer::disconnect_push_consumer (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 2c908911e53..8d021e57381 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -184,8 +184,7 @@ public:
   // Implement the callbacks for our consumer personality.
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &);
 
 private:
   ECM_Local_Federation* federation_;
@@ -235,10 +234,8 @@ public:
 
   // = The POA_RtecEventComm::PushComsumer 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));
+                     CORBA::Environment &_env);
+  virtual void disconnect_push_consumer (CORBA::Environment &);
 
 private:
   ECM_Local_Federation* federation_;
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index 1b392f4a59f..463dcf0828d 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -196,7 +196,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -216,25 +227,14 @@ 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 \
- $(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/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 \
@@ -250,8 +250,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -290,7 +289,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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 \
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 7f5fc421bc2..3eba6826489 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -1542,7 +1542,6 @@ Test_Supplier::push (const RtecEventComm::EventSet& events,
 
 void
 Test_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -1645,7 +1644,6 @@ Test_Consumer::close (CORBA::Environment &TAO_IN_ENV)
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events,
                      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, TAO_IN_ENV);
@@ -1653,7 +1651,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 Test_Consumer::disconnect_push_consumer (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index eee31288689..766cc3f3372 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -66,8 +66,7 @@ public:
   // Implement the callbacks for our consumer personality.
 
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &);
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
@@ -126,10 +125,8 @@ public:
   // Disconnect from the EC.
 
   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));
+                     CORBA::Environment &_env);
+  virtual void disconnect_push_consumer (CORBA::Environment &);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index aaad8b4f95d..44a06d5278c 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -194,7 +194,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -214,25 +225,14 @@ 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 \
- $(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/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 \
@@ -248,8 +248,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -288,7 +287,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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 \
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index d9b3c321ec2..235306bb1ca 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -122,7 +122,6 @@ Test_Consumer::accumulate (ECT_Driver::Latency_Stats& stats) const
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events,
                      CORBA::Environment &TAO_IN_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
     {
@@ -181,7 +180,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 Test_Consumer::disconnect_push_consumer (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 13b6eb2a249..e66f3185cbc 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -59,10 +59,8 @@ public:
   // Add our latency statistics to <stats>
 
   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));
+                     CORBA::Environment &_env);
+  virtual void disconnect_push_consumer (CORBA::Environment &);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index a7806156c5d..3381064c357 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -86,9 +86,6 @@ ECT_Throughput::run (int argc, char* argv[])
         root_poa->the_POAManager (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
       if (this->parse_args (argc, argv))
         return 1;
 
@@ -169,21 +166,6 @@ ECT_Throughput::run (int argc, char* argv[])
                       "no real-time features\n"));
         }
 
-#if 1
-      ACE_Config_Scheduler scheduler_impl;
-#else
-#include "ECT_Scheduler_Info.h"
-      ACE_Runtime_Scheduler scheduler_impl (
-        runtime_configs_size,
-        runtime_configs,
-        runtime_infos_size,
-        runtime_infos);
-#endif
-      RtecScheduler::Scheduler_var scheduler =
-        scheduler_impl._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-#if 0
       CORBA::Object_var naming_obj =
         this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
@@ -201,6 +183,21 @@ ECT_Throughput::run (int argc, char* argv[])
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
+#if 1
+      ACE_Config_Scheduler scheduler_impl;
+#else
+#include "ECT_Scheduler_Info.h"
+      ACE_Runtime_Scheduler scheduler_impl (
+        runtime_configs_size,
+        runtime_configs,
+        runtime_infos_size,
+        runtime_infos);
+#endif
+      RtecScheduler::Scheduler_var scheduler =
+        scheduler_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+#if 0
       CORBA::String_var str =
         this->orb_->object_to_string (scheduler.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -262,6 +259,9 @@ ECT_Throughput::run (int argc, char* argv[])
         ec_impl->_this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
       this->connect_consumers (scheduler.in (), channel.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index 06523308d30..7841d5818da 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -217,7 +217,18 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -237,25 +248,14 @@ 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 \
- $(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/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 \
@@ -271,8 +271,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -311,7 +310,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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 \
@@ -517,7 +515,18 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -537,25 +546,14 @@ 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 \
- $(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/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 \
@@ -571,8 +569,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -611,7 +608,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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 \
@@ -819,7 +815,18 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -839,25 +846,14 @@ 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 \
- $(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/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 \
@@ -873,8 +869,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -913,7 +908,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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 \
@@ -1185,7 +1179,18 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1205,25 +1210,14 @@ 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 \
- $(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/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 \
@@ -1239,8 +1233,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1279,7 +1272,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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 \
@@ -1490,7 +1482,18 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1510,25 +1513,14 @@ 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 \
- $(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/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 \
@@ -1544,8 +1536,7 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1584,7 +1575,6 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec.mt.conf b/TAO/orbsvcs/tests/EC_Throughput/ec.mt.conf
index 1559a88b3d3..121ac0a5c5d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ec.mt.conf
+++ b/TAO/orbsvcs/tests/EC_Throughput/ec.mt.conf
@@ -1,2 +1,2 @@
 # $Id$
-static EC_Factory "-ECpushsupplierset immediate  -ECdispatching mt -ECdispatchingthreads 4 -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
+static EC_Factory "-ECpushsupplierset immediate  -ECdispatching priority -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
index 253238b240c..76ea55816b3 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile
@@ -216,7 +216,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -236,25 +247,14 @@ 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 \
- $(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/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 \
@@ -263,8 +263,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -303,7 +302,6 @@ endif
  $(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 \
@@ -517,7 +515,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -537,25 +546,14 @@ 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 \
- $(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/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 \
@@ -564,8 +562,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -604,7 +601,6 @@ endif
  $(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 \
@@ -811,7 +807,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -831,25 +838,14 @@ 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 \
- $(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/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 \
@@ -858,8 +854,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -898,7 +893,6 @@ endif
  $(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 \
@@ -1129,7 +1123,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1149,25 +1154,14 @@ 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 \
- $(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/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 \
@@ -1176,8 +1170,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1216,7 +1209,6 @@ endif
  $(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 \
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index fad34d41af7..594c0c0ce62 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -256,7 +256,7 @@ EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV)
         continue;
 
       RtecEventChannelAdmin::EventChannel_ptr rmt_ec =
-        this->master_->channel (i)->event_channel_.in ();
+        this->master_->channel (i)->event_channel_;
 
       this->gwys_[i].init (rmt_ec,
                            this->event_channel_.in (),
@@ -298,7 +298,7 @@ EC_Observer::run_cleanup (CORBA::Environment& ACE_TRY_ENV)
         continue;
 
       RtecEventChannelAdmin::EventChannel_ptr rmt_ec =
-        this->master_->channel (j)->event_channel_.in ();
+        this->master_->channel (j)->event_channel_;
       rmt_ec->remove_observer (this->gwys_[j].observer_handle (),
                                ACE_TRY_ENV);
       ACE_CHECK;
diff --git a/TAO/orbsvcs/tests/Event/Basic/run_test.pl b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
index 5232c2ea79c..dda3bef63bb 100755
--- a/TAO/orbsvcs/tests/Event/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
@@ -12,50 +12,21 @@ unshift @INC, '../../../../../bin';
 require Process;
 require Uniqueid;
 
-$prefix = "." . $DIR_SEPARATOR;
-$status = 0;
-
 print STDERR "\n\nReconnect suppliers and consumers,",
   " using disconnect/connect calls\n";
-$T = Process::Create ($prefix . "Reconnect",
-		      " -suppliers 100 -consumers 100 -d 100");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
+system ("Reconnect -suppliers 100 -consumers 100 -d 100");
 
 print STDERR "\n\nReconnect suppliers and consumers, using connect calls\n";
-$T = Process::Create ($prefix . "Reconnect",
-		      " -suppliers 100 -consumers 100 -d 100 -s -c");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
-
+system ("Reconnect -suppliers 100 -consumers 100 -d 100 -s -c");
 
 print STDERR "\n\nShutdown EC with clients still attached\n";
-$T = Process::Create ($prefix . "Shutdown",
-		      " -verbose -suppliers 5 -consumers 5");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
-
+system ("Shutdown -verbose -suppliers 5 -consumers 5");
 
 print STDERR "\n\nComplex event channel test,",
   "multiple ECs connected through gateways\n";
-$T = Process::Create ($prefix . "Observer",
-		      " -ORBsvcconf observer.conf"
-		      ." -consumer_tshift 0 -consumers 5"
-		      ." -supplier_tshift 0 -suppliers 2"
-		      ." -burstsize 10 -burstcount 10 -burstpause 0");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
-
-exit $status;
+system ("Observer -ORBsvcconf observer.conf"
+        ." -consumer_tshift 0 -consumers 5"
+        ." -supplier_tshift 0 -suppliers 2"
+        ." -burstsize 10 -burstcount 10 -burstpause 0");
+
+exit 0;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index b2d18032e20..45cc9c58330 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -23,7 +23,7 @@ EC_Connect::EC_Connect (void)
 }
 
 void
-EC_Connect::execute_test (CORBA::Environment&)
+EC_Connect::execute_test (CORBA::Environment& ACE_TRY_ENV)
 {
   // this->EC_Driver::execute_test (ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index db93aaa9dee..54ca71ab35a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -214,7 +214,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -234,25 +245,14 @@ 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 \
- $(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/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 \
@@ -261,8 +261,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -301,7 +300,6 @@ endif
  $(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 \
@@ -515,7 +513,18 @@ endif
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -535,25 +544,14 @@ 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 \
- $(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/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 \
@@ -562,8 +560,7 @@ endif
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -602,7 +599,6 @@ endif
  $(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 \
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index e77bd596f8c..4a6af0f246d 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -42,7 +42,7 @@ EC_Throughput::print_usage (void)
 }
 
 void
-EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&)
+EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 {
 }
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
index 829fa8af17a..30b686cb0a1 100755
--- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
@@ -12,87 +12,36 @@ unshift @INC, '../../../../../bin';
 require Process;
 require Uniqueid;
 
-$prefix = "." . $DIR_SEPARATOR;
-$status = 0;
-
 print STDERR "\n\nThroughput/Latency single threaded configuration\n";
-$T = Process::Create ($prefix . "Throughput",
-		      " -ORBsvcconf ec.st.conf "
-		      . "-burstsize 100000 -burstcount 1");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
-
+system ("Throughput -ORBsvcconf ec.st.conf -burstsize 100000 -burstcount 1");
 
 print STDERR "\n\nThroughput/Latency MT-safe configuration\n";
-$T = Process::Create ($prefix . "Throughput",
-		      " -burstsize 100000"
-		      ." -burstcount 1");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
-
+system ("Throughput -burstsize 100000"
+        ." -burstcount 1");
 
 print STDERR "\n\nThroughput/Latency MT-safe configuration, 4 consumers\n";
-$T = Process::Create ($prefix . "Throughput",
-		      " -burstsize 100000"
-		      ." -burstcount 1 -consumers 4");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
-
+system ("Throughput -burstsize 100000"
+        ." -burstcount 1 -consumers 4");
 
 print STDERR "\n\nThroughput/Latency MT-safe configuration,",
   " 4 consumers 4 suppliers\n";
-$T = Process::Create ($prefix . "Throughput",
-		      " -burstsize 100000"
-		      ." -burstcount 1 -consumers 4 -suppliers 4");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
-
+system ("Throughput -burstsize 100000"
+        ." -burstcount 1 -consumers 4 -suppliers 4");
 
 print STDERR "\n\nThroughput/Latency MT-safe configuration,",
   " 4 consumers 4 suppliers\n";
-$T = Process::Create ($prefix . "Throughput",
-		      " -burstsize 100000"
-		      ." -burstcount 1 -consumers 4 -suppliers 4"
-		      ." -consumers_tshift 0 -suppliers_tshift 0");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
+system ("Throughput -burstsize 100000"
+        ." -burstcount 1 -consumers 4 -suppliers 4"
+        ." -consumers_tshift 0 -suppliers_tshift 0");
 
 print STDERR "\n\nConnection and disconnection time,",
   " 100 consumers 100 suppliers\n";
-$T = Process::Create ($prefix . "Connect",
-		      " -consumers 100 -suppliers 100"
-		      ." -connection_order interleaved");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
-
+system ("Connect -consumers 100 -suppliers 100"
+        ." -connection_order interleaved");
 
 print STDERR "\n\nConnection and disconnection time,",
   " 500 consumers 500 suppliers\n";
-$T = Process::Create ($prefix . "Connect",
-		      " -consumers 500 -suppliers 500"
-		      ." -connection_order interleaved");
-if ($T->TimedWait (60) == -1) {
-  print STDERR "ERROR: Test timedout\n";
-  $status = 1;
-  $T->Kill (); $T->TimedWait (1);
-}
+system ("Connect -consumers 500 -suppliers 500"
+        ." -connection_order interleaved");
 
-exit $status;
+exit 0;
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 7d25fe17bfb..f95b415b310 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -96,7 +96,6 @@ EC_Consumer::accumulate (EC_Driver::Throughput_Stats& throughput,
 void
 EC_Consumer::push (const RtecEventComm::EventSet& events,
                    CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->consumer_push (this->cookie_, events, ACE_TRY_ENV);
 
@@ -143,7 +142,6 @@ EC_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 EC_Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->consumer_disconnect (this->cookie_, ACE_TRY_ENV);
   this->supplier_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index e764d31666d..ce1ac9be637 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -77,10 +77,8 @@ public:
   // = 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));
+                     CORBA::Environment &_env);
+  virtual void disconnect_push_consumer (CORBA::Environment &);
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile
index ed0e242590d..e4ca0336cb5 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile
@@ -211,7 +211,18 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -231,25 +242,14 @@ 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 \
- $(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/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 \
@@ -258,8 +258,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -298,7 +297,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(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 \
@@ -521,7 +519,18 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -541,25 +550,14 @@ 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 \
- $(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/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 \
@@ -568,8 +566,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -608,7 +605,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(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 \
@@ -806,7 +802,18 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -826,25 +833,14 @@ 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 \
- $(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/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 \
@@ -853,8 +849,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -893,7 +888,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
  $(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 \
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 42226e8d78d..827ded8acff 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -160,7 +160,6 @@ EC_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
 void
 EC_Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->supplier_disconnect (this->cookie_, ACE_TRY_ENV);
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index 09e0e423134..d13d6bd2819 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -97,8 +97,7 @@ public:
   // Return an event type to push....
 
   // = The PushSupplier methods
-  virtual void disconnect_push_supplier (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_supplier (CORBA::Environment &);
 
 private:
   EC_Driver *driver_;
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
index fdee769899f..a8378f7aa59 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
@@ -163,7 +163,6 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 
 void
 Latency_Consumer::disconnect_push_consumer (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Consumer received disconnect from channel.\n"));
 }
@@ -171,7 +170,6 @@ Latency_Consumer::disconnect_push_consumer (CORBA::Environment &)
 void
 Latency_Consumer::push (const RtecEventComm::EventSet &events,
                         CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Latency_Consumer:push - "));
   ACE_TIMEPROBE (EVENT_LATENCY_PUSH_EVENT_TO_CONSUMER);
@@ -358,10 +356,8 @@ Latency_Supplier::Supplier::Supplier (Latency_Supplier* impl)
 {
 }
 
-void
-Latency_Supplier::Supplier::disconnect_push_supplier (
-    CORBA::Environment &TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+void Latency_Supplier::Supplier::disconnect_push_supplier
+  (CORBA::Environment &TAO_IN_ENV)
 {
   this->impl_->disconnect_push_supplier (TAO_IN_ENV);
 }
@@ -371,19 +367,15 @@ Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl)
 {
 }
 
-void
-Latency_Supplier::Consumer::disconnect_push_consumer (
-    CORBA::Environment &TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+void Latency_Supplier::Consumer::disconnect_push_consumer
+  (CORBA::Environment &TAO_IN_ENV)
 {
   this->impl_->disconnect_push_consumer (TAO_IN_ENV);
 }
 
-void
-Latency_Supplier::Consumer::push (
-    const RtecEventComm::EventSet &events,
-    CORBA::Environment &TAO_IN_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException))
+void Latency_Supplier::Consumer::push
+  (const RtecEventComm::EventSet &events,
+   CORBA::Environment &TAO_IN_ENV)
 {
   this->impl_->push (events, TAO_IN_ENV);
 }
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
index 2c0cc175e5a..2ef454cc317 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
@@ -50,8 +50,7 @@ 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.
 
   void entry_point (const char*);
@@ -60,9 +59,9 @@ public:
   void print_stats () /* const */;
   // Print timing statistics.
 
+// (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.
@@ -125,8 +124,7 @@ public:
   //
   class Supplier : public POA_RtecEventComm::PushSupplier {
   public:
-    virtual void disconnect_push_supplier (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void disconnect_push_supplier (CORBA::Environment &);
     // The channel is disconnecting.
 
   private:
@@ -140,12 +138,10 @@ public:
   class Consumer : public POA_RtecEventComm::PushConsumer {
   public:
     virtual void push (const RtecEventComm::EventSet &events,
-                       CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                       CORBA::Environment &);
     // The channel pushed some events to us.
 
-    virtual void disconnect_push_consumer (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void disconnect_push_consumer (CORBA::Environment &);
     // The channel is disconnecting.
 
   private:
diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
index 7f4baebc617..31052d29387 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ b/TAO/orbsvcs/tests/Event_Latency/Makefile
@@ -206,7 +206,18 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -226,25 +237,14 @@ 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 \
- $(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/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 \
@@ -260,8 +260,7 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -300,7 +299,6 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(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 \
diff --git a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
index 9112add6861..21ef33245a1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
@@ -37,8 +37,8 @@ IR_Helper::IR_Helper (char *server_name,
     ir_addr_ (0),
     ping_ (new Ping_i (debug)),
     implrepo_ (0),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    orb_ (CORBA::ORB::_duplicate (orb)),
+    poa_ (poa),
+    orb_ (orb),
     debug_ (debug)
 {
   const char *exception_message = "Null Message";
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile
index 1e1e8b5a296..9806cb9e960 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile
@@ -274,7 +274,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -294,25 +305,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -328,8 +328,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -368,7 +367,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -527,7 +525,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -547,25 +556,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -581,8 +579,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -621,7 +618,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -781,7 +777,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -801,25 +808,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -835,8 +831,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -875,7 +870,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -1034,7 +1028,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1054,25 +1059,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -1088,8 +1082,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1128,7 +1121,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -1369,7 +1361,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1389,25 +1392,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -1423,8 +1415,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1463,7 +1454,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -1626,7 +1616,16 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -1648,21 +1647,12 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/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 \
@@ -1678,8 +1668,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1718,7 +1707,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -1884,7 +1872,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1904,25 +1903,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -1938,8 +1926,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1978,7 +1965,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -2145,7 +2131,16 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -2167,21 +2162,12 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/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 \
@@ -2197,8 +2183,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2237,7 +2222,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -2406,7 +2390,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2426,25 +2421,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -2460,8 +2444,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2500,7 +2483,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -2659,7 +2641,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2679,25 +2672,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -2713,8 +2695,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2753,7 +2734,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -2916,7 +2896,16 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -2938,21 +2927,12 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/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 \
@@ -2968,8 +2948,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3008,7 +2987,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3172,7 +3150,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3192,25 +3181,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -3226,8 +3204,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3266,7 +3243,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3433,7 +3409,16 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3455,21 +3440,12 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/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 \
@@ -3485,8 +3461,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3525,7 +3500,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3693,7 +3667,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3713,25 +3698,14 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Key_Adapters.i \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_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/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 \
@@ -3747,8 +3721,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3787,7 +3760,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3962,7 +3934,16 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -3984,21 +3965,12 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/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 \
@@ -4014,8 +3986,7 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4054,7 +4025,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -4076,10 +4046,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 671c672fbfc..70f5f4e7f6f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -58,7 +58,7 @@ Airplane_Client_i::parse_args (void)
         break;
       case 'k':  // ior provide on command line
         this->server_key_ = ACE_OS::strdup (get_opts.optarg);
-        break;
+        break;  
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 9eb000f47f9..36a01002ef3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -63,7 +63,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
 {
   char poa_name[] = "plane";
 
-  ACE_TRY
+  ACE_TRY 
     {
       // Call the init of <TAO_ORB_Manager> to initialize the ORB and
       // create a child POA under the root POA.
@@ -71,7 +71,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), -1);
 
       ACE_TRY_CHECK;
-
+    
       this->argc_ = argc;
       this->argv_ = argv;
 
@@ -88,14 +88,11 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
                                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var child_poa = this->orb_manager_.child_poa ();
-      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 (),
+                                                       this->orb_manager_.child_poa (),
+                                                       this->orb_manager_.orb (),
                                                        TAO_debug_level),
                           -1);
 
@@ -107,8 +104,8 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
         PortableServer::string_to_ObjectId ("server");
 
       CORBA::Object_var server_obj =
-        child_poa->id_to_reference (id.in (),
-                                    ACE_TRY_ENV);
+        this->orb_manager_.child_poa ()->id_to_reference (id.in (),
+                                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       if (this->use_ir_ == 1)
@@ -116,10 +113,10 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
           this->ir_helper_->change_object (server_obj.inout (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
-
+       
       server_str =
-        orb->object_to_string (server_obj.in (),
-                               ACE_TRY_ENV);
+        this->orb_manager_.orb ()->object_to_string (server_obj.in (),
+                                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
@@ -137,7 +134,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
       ACE_RETHROW;
     }
   ACE_ENDTRY;
-
+  
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -169,7 +166,7 @@ Airplane_Server_i::run (CORBA::Environment &ACE_TRY_ENV)
       ACE_RETHROW;
     }
   ACE_ENDTRY;
-
+  
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/orbsvcs/tests/ImplRepo/implrepo.conf b/TAO/orbsvcs/tests/ImplRepo/implrepo.conf
index b77832e4a23..f90601df906 100644
--- a/TAO/orbsvcs/tests/ImplRepo/implrepo.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/implrepo.conf
@@ -1,3 +1,4 @@
 # $Id$
 static Resource_Factory "-ORBresources tss"
+static Client_Strategy_Factory ""
 static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null"
diff --git a/TAO/orbsvcs/tests/ImplRepo/svc.conf b/TAO/orbsvcs/tests/ImplRepo/svc.conf
index 5689abf761e..d5e0059859d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/svc.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/svc.conf
@@ -1,5 +1,4 @@
-
 # $Id$
-
-static Server_Strategy_Factory "-ORBtablesize 128"
-
+static Resource_Factory "-ORBresources global"
+static Client_Strategy_Factory ""
+static Server_Strategy_Factory "-ORBconcurrency reactive -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Logger/Makefile b/TAO/orbsvcs/tests/Logger/Makefile
index 7757179f682..a030bc5f8f6 100644
--- a/TAO/orbsvcs/tests/Logger/Makefile
+++ b/TAO/orbsvcs/tests/Logger/Makefile
@@ -205,7 +205,18 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -225,25 +236,14 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_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/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 \
@@ -259,8 +259,7 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -299,7 +298,6 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(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 \
@@ -495,7 +493,18 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -515,25 +524,14 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_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/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 \
@@ -549,8 +547,7 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -589,7 +586,6 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index 6ec890dee4a..bf12a27d526 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -209,7 +209,16 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
@@ -231,21 +240,12 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_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/Servant_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/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 \
@@ -261,8 +261,7 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -301,7 +300,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
@@ -527,7 +525,16 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
@@ -549,21 +556,12 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_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/Servant_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/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 \
@@ -579,8 +577,7 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -598,7 +595,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index ce7569202e1..2a564b1e9dc 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -405,7 +405,7 @@ Client::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV)
 // Test delete_property.
 
 int
-Client::test_delete_property (const char *property_name,
+Client::test_delete_property (CORBA::String property_name,
                               CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -414,9 +414,7 @@ Client::test_delete_property (const char *property_name,
 
   ACE_TRY
     {
-      CORBA::String_var property_name_var (property_name);
-      
-      this->propsetdef_->delete_property (property_name_var.in (),
+      this->propsetdef_->delete_property (property_name,
                                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index e7d4e53e5a4..9abb9bd0ca5 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -81,7 +81,7 @@ protected:
   int test_get_all_properties (CORBA::Environment &ACE_TRY_ENV);
   // Testing get_all_properties.
 
-  int test_delete_property (const char *property_name,
+  int test_delete_property (CORBA::String property_name,
                             CORBA::Environment &ACE_TRY_ENV);
   // Testing delete_property.
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index 1e7b5613859..fe6399174ca 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile
@@ -193,7 +193,18 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -213,25 +224,14 @@ 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 \
- $(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/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 \
@@ -247,8 +247,7 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -287,7 +286,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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 \
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
index efe052fa347..5b9771c30b1 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile
@@ -210,7 +210,18 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -230,25 +241,14 @@ 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 \
- $(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/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 \
@@ -264,8 +264,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -304,7 +303,6 @@ realclean:
  $(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 \
@@ -464,7 +462,18 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -484,25 +493,14 @@ 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 \
- $(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/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 \
@@ -518,8 +516,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -558,7 +555,6 @@ realclean:
  $(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 \
@@ -718,7 +714,18 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -738,25 +745,14 @@ 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 \
- $(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/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 \
@@ -772,8 +768,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -812,7 +807,6 @@ realclean:
  $(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 \
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 068d96099ec..ef86e2a6e5f 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -41,12 +41,10 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id, CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void id (CORBA::Short id, CORBA::Environment &ACE_TRY_ENV);
   // Sets id.
 
-  CORBA::Short id (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Short id (CORBA::Environment &ACE_TRY_ENV);
   // Gets id.
 
 private:
@@ -64,14 +62,12 @@ My_Test_Object::~My_Test_Object (void)
 
 CORBA::Short
 My_Test_Object::id (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return id_;
 }
 
 void
 My_Test_Object::id (CORBA::Short id, CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
 }
@@ -90,7 +86,7 @@ CosNaming_Client::CosNaming_Client (void)
 int
 CosNaming_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "pdstieylm:c:");
+  ACE_Get_Opt get_opts (argc_, argv_, "dstieylm:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -148,24 +144,11 @@ CosNaming_Client::parse_args (void)
                           Destroy_Test,
                           -1);
         break;
-      case 'p':
-        if (this->test_ == 0)
-          ACE_NEW_RETURN (this->test_,
-                          Persistent_Test_Begin (this->orbmgr_.orb ()),
-                          -1);
-        break;
-      case 'c':
-        if (this->test_ == 0)
-          ACE_NEW_RETURN (this->test_,
-                          Persistent_Test_End (this->orbmgr_.orb (),
-                                               get_opts.optarg),
-                          -1);
-        break;
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Argument %c \n usage:  %s"
                            " [-d]"
-                           " [-s or -e or -t or -i or -y or -p or -c<ior> or -m<size>]"
+                           " [-s or -e or -t or -i or -y]"
                            "\n",
                            c,
                            this->argv_ [0]),
@@ -216,8 +199,7 @@ CosNaming_Client::init (int argc, char **argv)
       if (this->parse_args () == -1)
         return -1;
 
-      CORBA::ORB_var orb = this->orbmgr_.orb ();
-      return this->naming_client_.init (orb.in ());
+      return this->naming_client_.init (this->orbmgr_.orb ());
     }
   ACE_CATCHANY
     {
@@ -363,7 +345,8 @@ MT_Test::svc (void)
 int
 MT_Test::execute (TAO_Naming_Client &root_context)
 {
-  if (CORBA::is_nil (this->orb_.in ()))
+  // if we weren't given the orb pointer - cannot proceed.
+  if (orb_ == 0)
     return -1;
 
   // Create data which will be used by all threads.
@@ -668,20 +651,13 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
         Test_Object::_narrow (result_obj_ref.in (),
                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (result_object.in ()))
+      if (CORBA::is_nil (result_object.in ())
+          || !(result_object->id (ACE_TRY_ENV) == CosNaming_Client::OBJ1_ID))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Problems with resolving foo in Tree Test - nil object ref.\n"),
+                           "Problems with resolving foo in Tree Test\n"),
                           -1);
-
-      CORBA::Short id = result_object->id (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (id != CosNaming_Client::OBJ1_ID)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Problems with resolving foo in Tree Test - wrong id.\n"),
-                          -1);
-
       // Unbind the object from the Naming Context and bind it back
       // in.
       root_context->unbind (test_name,
@@ -1205,7 +1181,7 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
 
       // Do the testing.
       not_empty_test (my_context,
-				      ACE_TRY_ENV);
+                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       my_context->unbind (object_name, ACE_TRY_ENV);
@@ -1220,7 +1196,7 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
 
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Destroy test");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Exceptions test");
       return -1;
     }
   ACE_ENDTRY;
@@ -1269,119 +1245,6 @@ Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref,
   ACE_CHECK;
 }
 
-Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb)
-  : orb_ (orb)
-{
-}
-
-int
-Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Create a name structure we will reuse.
-      CosNaming::Name test_name;
-      test_name.length (1);
-      test_name[0].id = CORBA::string_dup ("level1");
-
-      // Create and bind a naming context under the <root> context.
-      CosNaming::NamingContext_var level1_context =
-        root_context->bind_new_context (test_name,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Create and bind a naming context under <level1> context.
-      test_name[0].id = CORBA::string_dup ("level2");
-      CosNaming::NamingContext_var level2_context =
-        root_context->bind_new_context (test_name,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Log the ior of <level1_context> for use by <Persistent_Test_End>.
-      CORBA::String_var ior =
-        orb_->object_to_string (level1_context.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "%s\n", ior.in ()));
-
-      ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 1) OK.\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 1)");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-Persistent_Test_End::Persistent_Test_End (CORBA::ORB_ptr orb,
-                                          const char *ior)
-  : orb_ (orb),
-    ior_ (ior)
-{
-}
-
-int
-Persistent_Test_End::execute (TAO_Naming_Client &root_context)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Create a name structure we will reuse.
-      CosNaming::Name test_name;
-      test_name.length (1);
-      test_name[0].id = CORBA::string_dup ("level2");
-
-      // Convert stringified ior we got from <Persistent_Test_Begin>
-      // for <level1> Naming Context to Naming Context reference.
-      CORBA::Object_var obj =
-        orb_->string_to_object (ior_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CosNaming::NamingContext_var level1_context =
-        CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (level1_context.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot narrow object to Naming Context\n"),
-                          -1);
-
-      //  Resolve for <level2> context through the persistent ior we
-      // got from part 1 of this test.
-      obj = level1_context->resolve (test_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Now, resolve for <level2> context using the <root> context
-      // reference which we obtained through <resolve_initial_references>.
-      test_name.length (2);
-      test_name[0].id = CORBA::string_dup ("level1");
-      test_name[1].id = CORBA::string_dup ("level2");
-      CORBA::Object_var obj2 =
-        root_context->resolve (test_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Make sure we got the same answer through both methods.
-      if (obj2->_is_equivalent (obj.in ()))
-        ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 2) OK.\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 2)");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
 // This function runs the test.
 
 int
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index ca979271400..e933ab9b4f8 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -97,7 +97,7 @@ private:
   int size_;
   // Number of threads to spawn.  By default is set to 10.
 
-  CORBA::ORB_var orb_;
+  CORBA::ORB_ptr orb_;
   // A pointer to our ORB.
 
   char* name_service_ior_;
@@ -227,64 +227,6 @@ private:
                        CORBA::Environment &ACE_TRY_ENV);
 };
 
-class Persistent_Test_Begin : public Naming_Test
-{
-  // = TITLE
-  //    This class implements the first part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //    This test creates the Naming Context hierarchy:
-  //    root -> level1_context -> level2_context,
-  //    and prints out the ior of the <level1_context>.
-public:
-  // = Initialization and termination methods.
-
-  Persistent_Test_Begin (CORBA::ORB_ptr orb);
-  // Constructor.  Takes in an orb pointer.
-
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 1) code.
-
-private:
-
-  CORBA::ORB_var orb_;
-  // A pointer to our ORB (needed for object/string conversion).
-};
-
-class Persistent_Test_End : public Naming_Test
-{
-  // = TITLE
-  //    This class implements the second part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //   This test attempts to resolve <level2_context> both through the
-  //   <root> Naming Context, which it gets from <resolve_initial_references>, and
-  //   through <level1_context> stringified ior, which it gets from part 1 of
-  //   the persistent test.  The results of both methods are then
-  //   compared for equality.
-public:
-  // = Initialization and termination methods.
-
-  Persistent_Test_End (CORBA::ORB_ptr orb,
-                       const char * ior);
-  // Constructor.  Takes in an orb pointer and the ior received from
-  // <Persistent_Test_Begin>.
-
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 2).
-
-private:
-
-  CORBA::ORB_var orb_;
-  // A pointer to our ORB (used for string/object conversion).
-
-  const char* ior_;
-  // IOR of <level1_context> recorded during the run of part 1 of
-  // persistent test.
-};
-
 class CosNaming_Client
 {
   // = TITLE,
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index bf06e4c8fb1..1068b4866cd 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -10,7 +10,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 unshift @INC, '../../../../bin';
 require Process;
-require ACEutils;
 require Uniqueid;
 
 # amount of delay between running the servers
@@ -20,32 +19,22 @@ $sleeptime = 8;
 # variables for parameters
 
 $nsmport = 10000 + uniqueid ();
-$iorfile = "ns.ior";
 
 sub name_server
 {
-  my $args = "-ORBnameserviceport $nsmport -o $iorfile";
-  my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR".
-    "Naming_Service".$DIR_SEPARATOR.
-      "Naming_Service".$Process::EXE_EXT;
+  my $args = "-ORBnameserviceport $nsmport";
+  my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."Naming_Service".$DIR_SEPARATOR.
+             "Naming_Service".$Process::EXE_EXT;
 
-  unlink $iorfile;
   $NS = Process::Create ($prog, $args);
-
-  if (ACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
-    print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-    $NS->Kill (); $NS->TimedWait (1);
-    exit 1;
-  }
 }
 
 sub client
 {
-  my $args = $_[0]." "."-ORBnameserviceport $nsmport ".
-    "-ORBnameserviceior file://$iorfile";
+  my $args = $_[0]." "."-ORBnameserviceport $nsmport";
   my $prog = $EXEPREFIX."client".$Process::EXE_EXT;
 
-  $CL = Process::Create ($prog, $args);
+  system ($prog." ".$args);
 }
 
 # Options for all tests recognized by the 'client' program.
@@ -64,28 +53,17 @@ foreach $o (@opts)
 {
   name_server ();
 
-  print STDERR "\n";
-  print STDERR "          ".$comments[$test_number];
+  sleep $sleeptime;
+  print "\n";
+  print "          ".$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) {
-    print STDERR "ERROR: server timedout\n";
-    $NS->Kill (); $NS->TimedWait (1);
-  }
+
+  $NS->Kill ();
   $test_number++;
 }
 
-print STDERR "\n";
-
-print STDERR "          Multithreaded Test:\n";
+print "\n";
 
 # Now run the multithreaded test, sending output to the file.
 open (OLDOUT, ">&STDOUT");
@@ -94,36 +72,19 @@ open (OLDERR, ">&STDERR");
 open (STDERR, ">&STDOUT") or die "can't redirect stderror: $!";
 
 name_server ();
-
+sleep $sleeptime;
 client ("-m25");
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
-
 close (STDERR);
 close (STDOUT);
 open (STDOUT, ">&OLDOUT");
 open (STDERR, ">&OLDERR");
 
-$NS->Terminate (); $server = $NS->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $NS->Kill (); $NS->TimedWait (1);
-}
-
-unlink $iorfile;
+$NS->Kill ();
 
-$FL = Process::Create ($EXEPREFIX."process-m-output.pl",
-                       " test_run.data 25");
-$filter = $FL->TimedWait (60);
-if ($filter == -1) {
-  print STDERR "ERROR: filter timedout\n";
-  $FL->Kill (); $FL->TimedWait (1);
-}
-print STDERR "\n";
+print "          Multithreaded Test:\n";
+system ("process-m-output.pl test_run.data 25");
+print "\n";
 
 # @@ Capture any exit status from the processes.
 exit 0;
diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h
index fd674f01548..7d786b7b8cc 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.h
+++ b/TAO/orbsvcs/tests/Time/Client_i.h
@@ -98,5 +98,4 @@ private:
 
   CORBA::ORB_var orb_;
   // Remember our orb.
-
 };
diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile
index 5c9abf76af7..dfe459e5ffe 100644
--- a/TAO/orbsvcs/tests/Time/Makefile
+++ b/TAO/orbsvcs/tests/Time/Makefile
@@ -214,7 +214,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -234,25 +245,14 @@ 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/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/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 \
@@ -268,8 +268,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -308,7 +307,6 @@ realclean: clean
  $(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 \
@@ -498,7 +496,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -518,25 +527,14 @@ 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/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/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 \
@@ -552,8 +550,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -592,7 +589,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/orbsvcs/tests/Time/implrepo.conf b/TAO/orbsvcs/tests/Time/implrepo.conf
index 4c30fa8cb6a..40da4ea1084 100644
--- a/TAO/orbsvcs/tests/Time/implrepo.conf
+++ b/TAO/orbsvcs/tests/Time/implrepo.conf
@@ -2,4 +2,4 @@
 #
 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 "
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBsystemidpolicydemuxstrategy dynamic -ORBpoalock null -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 0aeb8cf4bcc..20f2db2942e 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -36,7 +36,6 @@ LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
 LSRC    = $(addsuffix .cpp,$(FILES))
-PSRC    = $(addsuffix .cpp,$(BIN))
 LIBS    = -lorbsvcs -lTAO
 LDLIBS  = -lorbsvcs -lTAO
 VLDLIBS = $(LDLIBS:%=%$(VAR))
@@ -230,7 +229,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -250,25 +260,14 @@ 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/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/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 \
@@ -284,8 +283,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -324,7 +322,6 @@ realclean: clean
  $(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 \
@@ -483,7 +480,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -503,25 +511,14 @@ 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/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/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 \
@@ -537,8 +534,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -577,7 +573,6 @@ realclean: clean
  $(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 \
@@ -736,7 +731,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -756,25 +762,14 @@ 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/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/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 \
@@ -790,8 +785,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -830,7 +824,6 @@ realclean: clean
  $(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 \
@@ -1017,7 +1010,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1037,25 +1041,14 @@ 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/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/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 \
@@ -1071,8 +1064,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1111,7 +1103,6 @@ realclean: clean
  $(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 \
@@ -1281,7 +1272,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1301,25 +1303,14 @@ 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/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/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 \
@@ -1335,8 +1326,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1375,7 +1365,6 @@ realclean: clean
  $(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 \
@@ -1568,7 +1557,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1588,25 +1588,14 @@ 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/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/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 \
@@ -1622,8 +1611,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1662,7 +1650,6 @@ realclean: clean
  $(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 \
@@ -1863,31 +1850,8 @@ realclean: clean
  $(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 \
@@ -1898,249 +1862,6 @@ realclean: clean
  $(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 \
- Simple_Dynamic.cpp
-.obj/export_test.o .obj/export_test.so .shobj/export_test.o .shobj/export_test.so: export_test.cpp \
- $(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 \
- Offer_Exporter.h TT_Info.h TTestS.h TTestC.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 \
@@ -2162,321 +1883,12 @@ realclean: clean
  $(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/poa_macros.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 \
- TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- Simple_Dynamic.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/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/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/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Simple_Dynamic.cpp Offer_Importer.h \
- $(ACE_ROOT)/ace/Task_T.h \
- $(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 \
- Service_Type_Exporter.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
-.obj/import_test.o .obj/import_test.so .shobj/import_test.o .shobj/import_test.so: import_test.cpp \
- $(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 \
- Offer_Importer.h TT_Info.h TTestS.h TTestC.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 \
@@ -2492,8 +1904,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2532,7 +1943,6 @@ realclean: clean
  $(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 \
@@ -2544,346 +1954,26 @@ realclean: clean
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
- TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/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/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/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
-.obj/colocated_test.o .obj/colocated_test.so .shobj/colocated_test.o .shobj/colocated_test.so: colocated_test.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 \
- $(ACE_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/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/Get_Opt.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 \
- $(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 \
- Offer_Exporter.h TT_Info.h TTestS.h TTestC.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 \
- TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- Simple_Dynamic.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/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/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 \
- Simple_Dynamic.cpp Offer_Importer.h \
- $(ACE_ROOT)/ace/Task_T.h \
- $(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 \
- Service_Type_Exporter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+ Simple_Dynamic.cpp
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 24bbefea8b8..7042be1a9ad 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -9,7 +9,7 @@ TAO_Offer_Exporter::
 TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                     CORBA::Boolean verbose,
                     CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
     : verbose_ (verbose)
 {
   // Initialize the offer sequences and structures.
@@ -34,16 +34,6 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
 
 void
 TAO_Offer_Exporter::export_offers (CORBA::Environment& TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::Register::InvalidObjectRef,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::Register::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::PropertyTypeMismatch,
-                     CosTrading::ReadonlyDynamicProperty,
-                     CosTrading::MissingMandatoryProperty,
-                     CosTrading::DuplicatePropertyName))
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting offers.\n"));
 
@@ -61,7 +51,7 @@ TAO_Offer_Exporter::export_offers (CORBA::Environment& TAO_IN_ENV)
 void
 TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
                                CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -121,7 +111,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
 
 void
 TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -196,7 +186,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& TAO_IN_ENV)
 
 void
 TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
                    CosTrading::Register::ProxyOfferId))
@@ -230,7 +220,7 @@ TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& TAO_IN_ENV)
 
 void
 TAO_Offer_Exporter::describe_offers (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
                    CosTrading::Register::ProxyOfferId))
@@ -276,7 +266,7 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& TAO_IN_ENV)
 
 void
 TAO_Offer_Exporter::modify_offers (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -331,7 +321,7 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& TAO_IN_ENV)
 void
 TAO_Offer_Exporter::
 withdraw_offers_using_constraints (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTrading::IllegalConstraint,
@@ -375,7 +365,7 @@ withdraw_offers_using_constraints (CORBA::Environment& TAO_IN_ENV)
 
 CosTrading::OfferIdSeq*
 TAO_Offer_Exporter::grab_offerids (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
   if (this->verbose_)
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index de4e98abb00..52139a62312 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -26,12 +26,12 @@ public:
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose,
                       CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   ~TAO_Offer_Exporter (void);
 
   void export_offers (CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -44,7 +44,7 @@ public:
   // Export a number of offers to the Trading Service.
 
   void export_offers_to_all (CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -58,21 +58,21 @@ public:
   // bootstrapped trader.
 
   void withdraw_offers (CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
   // Withdraw all exported offers.
 
   void describe_offers (CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_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& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -87,7 +87,7 @@ public:
   // Remove some properties and change some properties in each offer.
 
   void withdraw_offers_using_constraints (CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTrading::IllegalConstraint,
@@ -97,7 +97,7 @@ public:
 private:
 
   CosTrading::OfferIdSeq* grab_offerids (CORBA::Environment& env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
   void create_offers (void);
@@ -105,7 +105,7 @@ private:
 
   void export_to (CosTrading::Register_ptr reg,
                   CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 92880472e2f..b433c70c21d 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -13,7 +13,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
 
 void
 TAO_Offer_Importer::perform_queries (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTrading::IllegalConstraint,
@@ -40,7 +40,7 @@ TAO_Offer_Importer::perform_queries (CORBA::Environment& TAO_IN_ENV)
 
 void
 TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTrading::IllegalConstraint,
@@ -139,7 +139,7 @@ void
 TAO_Offer_Importer::
 perform_queries_with_policies (const TAO_Policy_Creator& policies,
                                CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTrading::IllegalConstraint,
@@ -229,7 +229,7 @@ void
 TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
                                      CosTrading::OfferIterator_ptr offer_iterator,
                                      CORBA::Environment& TAO_IN_ENV) const
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TRY
     {
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index c55f8314e3a..06ff84848c1 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -33,7 +33,7 @@ public:
                       CORBA::Boolean verbose = 1);
 
   void perform_queries (CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTrading::IllegalConstraint,
@@ -47,7 +47,7 @@ public:
   // Barrage the bootstrapped-to trader with queries.
 
   void perform_directed_queries (CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTrading::IllegalConstraint,
@@ -65,7 +65,7 @@ private:
 
   void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager,
                                       CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTrading::IllegalConstraint,
@@ -82,7 +82,7 @@ private:
   void display_results (const CosTrading::OfferSeq& offer_seq,
                         CosTrading::OfferIterator_ptr offer_iterator,
                         CORBA::Environment& _env) const
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // Display the results of the query to the screen.
 
   CORBA::Boolean verbose_;
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index e0502e4b1f3..0074451d717 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -8,7 +8,6 @@ TAO_Service_Type_Exporter::
 TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
                            CORBA::Boolean verbose,
                            CORBA::Environment& TAO_IN_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   : verbose_ (verbose),
     lookup_ (lookup_if)
 {
@@ -26,7 +25,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
 
 void
 TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::HasSubTypes))
@@ -63,7 +62,7 @@ TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& TAO_IN_ENV)
 
 void
 TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
                    CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
@@ -82,7 +81,7 @@ TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& TAO_IN_ENV)
 
 void
 TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
                    CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
@@ -140,7 +139,7 @@ void
 TAO_Service_Type_Exporter::
 add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
                   CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
                    CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
@@ -201,7 +200,7 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
 
 void
 TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  TAO_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TRY
     {
@@ -233,7 +232,7 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& TAO_IN_ENV)
 
 void
 TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
@@ -266,7 +265,7 @@ TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& TAO_IN_ENV)
 
 void
 TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& TAO_IN_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
 {
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index a99ab322991..004caf3410d 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -25,17 +25,17 @@ public:
   TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
                              CORBA::Boolean verbose,
                              CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
 
   void remove_all_types (CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_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& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
                      CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
@@ -47,7 +47,7 @@ public:
   // Add all the generated service types to the trading service instance.
 
   void add_all_types_to_all (CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
                      CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
@@ -60,19 +60,19 @@ public:
   // instances linked to the trading service we bootstrapped to.
 
   void list_all_types (CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO_THROW_SPEC ((CORBA::SystemException));
   // List all the service types registered with the trading service
   // instance.
 
   void describe_all_types (CORBA::Environment& _env)
-  ACE_THROW_SPEC ((CORBA::SystemException,
+  TAO_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& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
   // Same as describe_all_types, but fully describe lists the
@@ -86,7 +86,7 @@ private:
 
   void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
                          CORBA::Environment& _env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
+    TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
                      CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index ba02abd1aef..866f2a4b380 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -18,7 +18,7 @@ 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))
+  TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* return_value = 0;
   ACE_NEW_RETURN (return_value, CORBA::Any, 0);
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 81fe0850980..3abbba5526a 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -29,7 +29,7 @@ public:
                               CORBA::TypeCode_ptr /* returned_type */,
                               const CORBA::Any& /* extra_info */,
                               CORBA::Environment &)
-    ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
+    TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
 private:
 
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index 13296b61050..91f5d65619f 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -37,7 +37,7 @@ public:
     Remote_Output (void) {}
 
     virtual void confirm (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
@@ -50,7 +50,7 @@ public:
     Printer (void) {}
 
     virtual void confirm (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
@@ -62,7 +62,7 @@ public:
     Plotter (void) {}
 
     virtual void confirm (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
@@ -74,7 +74,7 @@ public:
     File_System (void) {}
 
     virtual void confirm (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
@@ -86,7 +86,7 @@ public:
     PostScript_Printer (void) {}
 
     virtual void confirm (CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException)) {}
+      TAO_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
   };
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
index 46e8a097f9d..c477081db5e 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
@@ -222,7 +222,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -242,25 +253,14 @@ 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/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/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 \
@@ -276,8 +276,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -316,7 +315,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index ace23784b6a..a8a5eacbceb 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -100,7 +100,7 @@ private:
   void (DII_Cubit_Client::*op_array_[NUMBER_OF_TESTS])(void);
   // Array of pointers to the operation functions.
 
-  static const char *stats_messages_[];
+  static char *stats_messages_[];
   // Array of labels for passing to print_stats.
 
   int argc_;
@@ -172,7 +172,7 @@ DII_Cubit_Client::~DII_Cubit_Client (void)
 
 // An array of messages to pass to print_stats, so we can step through
 // this along with op_array_.
-const char *DII_Cubit_Client::stats_messages_[] =
+char *DII_Cubit_Client::stats_messages_[] =
 {
   "DII cube_short",
   "DII cube_octet",
@@ -223,8 +223,7 @@ DII_Cubit_Client::init (int argc, char **argv)
 
       // make_cubit takes a char* arg that it doesn't use, but we must
       // still include it in the request.
-      CORBA::String dummy = ACE_const_cast (char *,
-                                            "");
+      CORBA::String dummy = "";
 
       mc_req->add_in_arg () <<= dummy;
 
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
index de86a434f0a..896abdb9ac9 100755
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
@@ -5,114 +5,25 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-# The first three lines above let this script run without specifying the
-# full path to perl, as long as it is in the user's PATH.
-# Taken from perlrun man page.
+unshift @INC, '../../../../../bin';
+require Process;
 
-# Do not use environment variables here since not all platforms use ACE_ROOT
-use lib "../../../../../bin";
+$iorfile = "theior";
+$sleeptime = 5;
 
-require ACEutils;
+$SV = Process::Create ("..$DIR_SEPARATOR"
+                       ."IDL_Cubit".$DIR_SEPARATOR.
+                       "server".$Process::EXE_EXT,
+                       " -o $iorfile");
 
-$iorfile = "cubit.ior";
-$clexepref = '.' . $DIR_SEPARATOR;
-$svexepref = ".." . $DIR_SEPARATOR . "IDL_Cubit" . $DIR_SEPARATOR;
-$svnsflags = " -o $iorfile";
-$clnsflags = " -f $iorfile";
-$clflags = "";
-$svflags = "";
+sleep $sleeptime;
 
-# Make sure the file is gone, so we can wait on it.
-unlink $iorfile;
-
-
-# Parse the arguments
-
-for ($i = 0; $i <= $#ARGV; $i++)
-{
-  SWITCH:
-  {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
-    {
-      print "run_test [-h] [-n num] [-sleeptime t] [-debug] [-release] [-orblite]\n";
-      print "\n";
-      print "-h                  -- prints this information\n";
-      print "-n num              -- client uses <num> iterations\n";
-      print "-sleeptime t        -- run_test should sleep for <t> seconds between running\n";
-      print "                       the server and client (default is 5 seconds)\n";
-      print "-debug              -- sets the debug flag for both client and server\n";
-      print "-release            -- runs the Release version of the test (for NT use)\n";
-      print "-orblite            -- Use the lite version of the orb";
-      exit;
-    }
-    if ($ARGV[$i] eq "-debug")
-    {
-      $clflags .= " -d";
-      $svflags .= " -d";
-      last SWITCH;
-    }
-    if ($ARGV[$i] eq "-release")
-    {
-      $exepref = "Release".$DIR_SEPARATOR;
-      last SWITCH;
-    }
-    if ($ARGV[$i] eq "-n")
-    {
-      $clflags .= " -n $ARGV[$i + 1]";
-      $i++;
-      last SWITCH;
-    }
-    if ($ARGV[$i] eq "-sleeptime")
-    {
-      $ACE::sleeptime = $ARGV[$i + 1];
-      $i++;
-      last SWITCH;
-    }
-    if ($ARGV[$i] eq "-orblite")
-    {
-      $clflags .= " -ORBgioplite";
-      $svflags .= " -ORBgioplite";
-      last SWITCH;
-    }
-    print "run_test: Unknown Option: ".$ARGV[$i]."\n";
-  }
-}
-
-(-f $svexepref."server".$Process::EXE_EXT  &&
- -f $clexepref."client".$Process::EXE_EXT)  ||
-  die "$0: server and/or client need to be built!\n";
-
-$SV = Process::Create ($svexepref."server".$Process::EXE_EXT,
-                       $svflags.
-                       $svnsflags);
+$status = system ("client".$Process::EXE_EXT.
+                  " -f $iorfile -x");
 
-# Put in a wait between the server and client
-
-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 ($clexepref . "client".$Process::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);
-}
+# @@ TODO change to Wait() once the -x option works.
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
-if ($server != 0 || $client != 0) {
-  exit 1;
-}
-
-exit 0;
+exit $status;
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 cf4b033491d..14818f46314 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -120,7 +120,7 @@ Cubit_Client::func (u_int i)
 // Reads the Cubit factory ior from a file
 
 int
-Cubit_Client::read_ior (const char *filename)
+Cubit_Client::read_ior (char *filename)
 {
   // Open the file for reading.
   this->f_handle_ = ACE_OS::open (filename,0);
@@ -765,7 +765,7 @@ Cubit_Client::cube_rti_data (int,
           oumh.messagePayload[k] = Cubit::HandleValuePair ();
           Cubit::HandleValuePair &hvp = oumh.messagePayload[k];
           hvp.handle = k * k;
-          const char *d1 = "somedata";
+          char *d1 = "somedata";
           hvp.data.length (ACE_OS::strlen (d1)+1);
           ACE_OS::strcpy ((char *) hvp.data.get_buffer (), d1);
         }
@@ -1177,7 +1177,7 @@ Cubit_Client::~Cubit_Client (void)
 
 
 int
-Cubit_Client::init (int argc, char **argv, const char *collocation_test_ior)
+Cubit_Client::init (int argc, char **argv, char *collocation_test_ior)
 {
   this->argc_ = argc;
   this->argv_ = argv;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 4f68d5cafd7..4d3b38ecc43 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -52,7 +52,7 @@ public:
   int run ();
   // Execute client example code.
 
-  int init (int argc, char **argv, const char *collocation_test_ior = 0);
+  int init (int argc, char **argv, char *collocation_test_ior = 0);
   // Initialize the client communication endpoint with server.
   // <collocation_test_ior> is used to pass in the ior file name.
 
@@ -61,7 +61,7 @@ private:
   // Simple function that returns the substraction of 117 from the
   // parameter.
 
-  int read_ior (const char *filename);
+  int read_ior (char *filename);
   // Function to read the cubit factory ior from a file.
 
   int parse_args (void);
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 bfe2add629d..7e0cd372c1b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -27,8 +27,7 @@ Cubit_Server::parse_args (void)
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), 
-                            -1);
+                             get_opts.optarg), -1);
         break;
       case '?':
       default:
@@ -38,7 +37,7 @@ Cubit_Server::parse_args (void)
                            " [-o] <ior_output_file>"
                            "\n",
                            argv_ [0]),
-                          -1);
+                          1);
       }
 
   // Indicates successful parsing of command line.
@@ -64,19 +63,15 @@ Cubit_Server::init (int argc,
   this->argc_ = argc;
   this->argv_ = argv;
 
-  if (this->parse_args () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "parse_args"),
-                      -1);
+  this->parse_args ();
+  // @@ Check for the return value here.
+
   // Get the orb
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
   // Now create the implementations
   this->factory_impl_ = new Cubit_Factory_i (orb.in ());
 
-  this->factory_impl_->set_default_poa (this->orb_manager_.root_poa ());
-
   this->factory_id_ =
     this->orb_manager_.activate_under_child_poa ("factory",
                                                  this->factory_impl_,
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 a3e0cc47401..79c0f3dee3c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -135,19 +135,12 @@ Cubit_Factory_i::~Cubit_Factory_i (void)
 
 Cubit_ptr
 Cubit_Factory_i::make_cubit (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->cubit_registered_ = 1;
 
   return my_cubit_._this (env);
 }
 
-void
-Cubit_Factory_i::set_default_poa (PortableServer::POA_ptr poa)
-{
-  this->my_cubit_.set_default_poa (poa);
-}
-
 // Constructor
 
 Cubit_i::Cubit_i (CORBA::ORB_ptr orb)
@@ -161,28 +154,14 @@ Cubit_i::~Cubit_i (void)
 {
 }
 
-PortableServer::POA_ptr
-Cubit_i::_default_POA (CORBA::Environment &)
-{
-  return this->poa_.ptr ();
-}
-
-void
-Cubit_i::set_default_poa (PortableServer::POA_ptr poa)
-{
-  this->poa_ = PortableServer::POA::_duplicate (poa);
-}
-
 void
 Cubit_i::cube_oneway (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START);
 }
 
 void
 Cubit_i::cube_void (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START);
 }
@@ -192,7 +171,6 @@ Cubit_i::cube_void (CORBA::Environment &)
 CORBA::Octet
 Cubit_i::cube_octet (CORBA::Octet o,
                      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_START);
 
@@ -205,7 +183,6 @@ Cubit_i::cube_octet (CORBA::Octet o,
 CORBA::Short
 Cubit_i::cube_short (CORBA::Short s,
                      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_SHORT_START);
 
@@ -218,7 +195,6 @@ Cubit_i::cube_short (CORBA::Short s,
 CORBA::Long
 Cubit_i::cube_long (CORBA::Long l,
                     CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_START);
 
@@ -231,7 +207,6 @@ Cubit_i::cube_long (CORBA::Long l,
 Cubit::Many
 Cubit_i::cube_struct (const Cubit::Many &values,
                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_STRUCT_START);
 
@@ -250,7 +225,6 @@ Cubit_i::cube_struct (const Cubit::Many &values,
 Cubit::oneof
 Cubit_i::cube_union (const Cubit::oneof &values,
                      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_UNION_START);
 
@@ -285,7 +259,6 @@ void
 Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
                              Cubit::long_seq_out output,
                              CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
 
@@ -312,7 +285,6 @@ void
 Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
                               Cubit::octet_seq_out output,
                               CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_SEQUENCE_START);
 
@@ -350,7 +322,6 @@ void
 Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
                              Cubit::many_seq_out output,
                              CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_MANY_SEQUENCE_START);
 
@@ -384,7 +355,6 @@ void
 Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
                         Cubit::RtiPacket_out output,
                         CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
 
@@ -414,7 +384,6 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
 // Shutdown.
 
 void Cubit_i::shutdown (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
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 2b8a19390d1..a1d1b3b2a0d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -37,75 +37,56 @@ public:
   ~Cubit_i (void);
   // Destructor
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Returns the default POA for this servant.
-
-  virtual void cube_oneway (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cube_oneway (CORBA::Environment &env);
   // Test a oneway call.
 
-  virtual void cube_void (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void cube_void (CORBA::Environment &env);
   // Test a twoway call.
 
   virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // Cube an octet
 
   virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // Cube a short
 
   virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 CORBA::Environment &env);
   // Cube a long
 
   virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // Cube a struct.
 
   virtual Cubit::oneof cube_union (const Cubit::oneof &values,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // Cube a union.
 
   virtual void cube_long_sequence (const Cubit::long_seq &input,
                                    Cubit::long_seq_out output,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // Cube a sequence.
 
   virtual void cube_octet_sequence (const Cubit::octet_seq &input,
                                     Cubit::octet_seq_out output,
-                                    CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                    CORBA::Environment &_env);
   // Cube an octet sequence.
 
   virtual void cube_many_sequence (const Cubit::many_seq & input,
                                    Cubit::many_seq_out output,
-                                   CORBA::Environment &_tao_environment)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &_tao_environment);
   // Cube an Many sequence.
 
   virtual void cube_rti_data (const Cubit::RtiPacket &input,
                               Cubit::RtiPacket_out output,
-                              CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                              CORBA::Environment &env);
   // Cube a sequence.
 
-  virtual void shutdown (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (CORBA::Environment &env);
   // Shutdown routine.
 
-  void set_default_poa (PortableServer::POA_ptr poa);
-  // Set default poa.
-
 protected:
-  PortableServer::POA_var poa_;
 
   CORBA::ORB_var orb_;
   // Keep a pointer to the ORB so we can shut it down.
@@ -125,12 +106,9 @@ public:
   ~Cubit_Factory_i (void);
   // Destructor.
 
-  virtual Cubit_ptr make_cubit (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Cubit_ptr make_cubit (CORBA::Environment &env);
   // Make a cubit object.
 
-  void set_default_poa (PortableServer::POA_ptr poa);
-
 private:
   Cubit_i my_cubit_;
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
index a81d65b1111..668334b40e1 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
@@ -238,7 +238,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -258,25 +269,14 @@ 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/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/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 \
@@ -292,8 +292,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -332,7 +331,6 @@ realclean: clean
  $(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 \
@@ -491,7 +489,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -511,25 +520,14 @@ 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/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/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 \
@@ -545,8 +543,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -585,7 +582,6 @@ realclean: clean
  $(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 \
@@ -755,7 +751,16 @@ realclean: clean
  $(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 \
@@ -777,21 +782,12 @@ realclean: clean
  $(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/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 \
@@ -807,8 +803,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -847,7 +842,6 @@ realclean: clean
  $(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 \
@@ -1019,7 +1013,16 @@ realclean: clean
  $(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 \
@@ -1041,21 +1044,12 @@ realclean: clean
  $(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/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 \
@@ -1071,8 +1065,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1111,7 +1104,6 @@ realclean: clean
  $(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 \
@@ -1288,7 +1280,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1308,25 +1311,14 @@ 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/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/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 \
@@ -1342,8 +1334,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1382,7 +1373,6 @@ realclean: clean
  $(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 \
@@ -1553,7 +1543,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1573,25 +1574,14 @@ 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/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/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 \
@@ -1607,8 +1597,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1647,7 +1636,6 @@ realclean: clean
  $(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 \
@@ -1815,7 +1803,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1835,25 +1834,14 @@ 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/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/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 \
@@ -1869,8 +1857,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1909,7 +1896,6 @@ realclean: clean
  $(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 \
@@ -2085,7 +2071,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2105,25 +2102,14 @@ 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/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/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 \
@@ -2139,8 +2125,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2179,7 +2164,6 @@ realclean: clean
  $(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 \
@@ -2342,7 +2326,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2362,25 +2357,14 @@ 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/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/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 \
@@ -2396,8 +2380,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2436,7 +2419,6 @@ realclean: clean
  $(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 \
@@ -2595,7 +2577,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2615,25 +2608,14 @@ 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/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/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 \
@@ -2649,8 +2631,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2689,7 +2670,6 @@ realclean: clean
  $(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 \
@@ -2848,7 +2828,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2868,25 +2859,14 @@ 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/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/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 \
@@ -2902,8 +2882,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2942,7 +2921,6 @@ realclean: clean
  $(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 \
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 5f5bcf8ff92..558c0067bc8 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBResources tss -ORBReactorType select_st"
-static Client_Strategy_Factory "-ORBIIOPProfileLock null -ORBClientConnectionHandler ST"
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null -ORBConnectorLock null"
+static Resource_Factory "-ORBresources tss -ORBreactortype select_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 419494e753c..576229cfc49 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -15,15 +15,11 @@ svr_worker (void *arg)
 {
   Cubit_Server cubit_server;
   ACE_Barrier *barrier = (ACE_Barrier *) arg;
-  char *fake[] = {"server", "-o", THE_IOR_FILE};//, "-ORBcollocationstrategy", "direct" };
+  char *fake[] = {"server", "-o", THE_IOR_FILE };
 
   ACE_TRY_NEW_ENV
     {
-      if (cubit_server.init (3,
-                             ACE_const_cast (char **,
-                                             fake),
-                             ACE_TRY_ENV)
-          == -1)
+      if (cubit_server.init (3, fake, ACE_TRY_ENV) == -1)
         return (void *) 1;
       else
         {
@@ -75,6 +71,7 @@ main (int argc, char **argv)
   barrier.wait ();
   ACE_OS::sleep (1);
 
+  {
     Cubit_Client cubit_client (test_collocation, 1);
     // We want to test collocation, so create
     // cubit_client with parameter 1 set.  Make sure
@@ -84,6 +81,7 @@ main (int argc, char **argv)
       return 1;
     else
       retv = cubit_client.run ();
+  }
 
   ACE_THREAD_MANAGER->wait ();
   return retv;
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 bd95e63be07..7791b0f7a06 100755
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -14,14 +14,16 @@ use lib "../../../../../bin";
 
 require ACEutils;
 
+$nsport = 20000 + ACE::uniqueid ();
 $iorfile = "cubit.ior";
 $exepref = '.' . $DIR_SEPARATOR;
 $svnsflags = " -o $iorfile";
 $clnsflags = " -f $iorfile";
 $clflags = "";
 $svflags = "";
+$mcast = 0;
 
-# Make sure the file is gone, so we can wait on it.
+#make sure the file is gone, so we can wait on it.
 unlink $iorfile;
 
 # Parse the arguments
@@ -32,10 +34,11 @@ for ($i = 0; $i <= $#ARGV; $i++)
   {
     if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
     {
-      print "run_test [-h] [-n num] [-sleeptime t] [-debug] [-release] [-orblite]\n";
+      print "run_test [-h] [-n num] [-mcast] [-sleeptime t] [-debug] [-release] [-orblite]\n";
       print "\n";
       print "-h                  -- prints this information\n";
       print "-n num              -- client uses <num> iterations\n";
+      print "-mcast              -- uses the multicast version of the nameservice\n";
       print "-sleeptime t        -- run_test should sleep for <t> seconds between running\n";
       print "                       the server and client (default is 5 seconds)\n";
       print "-debug              -- sets the debug flag for both client and server\n";
@@ -43,6 +46,13 @@ for ($i = 0; $i <= $#ARGV; $i++)
       print "-orblite            -- Use the lite version of the orb";
       exit;
     }
+    if ($ARGV[$i] eq "-mcast")
+    {
+      $mcast = 1;
+      $clnsflags = " -ORBnameserviceport $nsport";
+      $svnsflags = " -ORBnameserviceport $nsport";
+      last SWITCH;
+    }
     if ($ARGV[$i] eq "-debug")
     {
       $clflags .= " -d";
@@ -85,32 +95,26 @@ $SV = Process::Create ($exepref."server".$Process::EXE_EXT,
                        $svnsflags);
 
 # Put in a wait between the server and client
-
-if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile>\n";
-  $SV->Kill (); $SV->TimedWait (1);
-  exit 1;
+if ($mcast == 1)
+{
+  sleep $ACE::sleeptime;
+}
+else
+{
+  ACE::waitforfile ($iorfile);
 }
 
-$CL = Process::Create ($exepref . "client".$Process::EXE_EXT,
-                       " $clflags $clnsflags -x");
+unlink
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
+$status = system ($exepref."client".$Process::EXE_EXT.
+                  $clflags.
+                  $clnsflags.
+                  " -x");
 
-$server = $SV->TimedWait (10);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+# @@ TODO change to Wait() once the -x option works.
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
-if ($server != 0 || $client != 0) {
-  exit 1;
-}
-
-exit 0;
+# @@ Capture any errors from the server too.
+exit $status;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 707a303cb04..3e062048b55 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 tss"
-static Client_Strategy_Factory "-ORBIIOPProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0"
+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/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 3409654e8fe..8c3e86a1c90 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -191,7 +191,7 @@ Cubit_Task::create_servants (void)
         {
           ACE_OS::sprintf (buffer,
                            "%s%02d",
-                           this->key_,
+                           (char *) this->key_,
                            this->task_id_);
 
           ACE_NEW_RETURN (this->servants_[i],
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 51071c0ce3a..50e58f33f4f 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -57,7 +57,7 @@ private:
   int create_servants (void);
   // Create the servants.
 
-  const char *key_;
+  CORBA::String key_;
   // All cubit objects will have this as prefix to its key.
 
   char *orbname_;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
index 6eaa29db1b4..d7bbaefadcf 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
@@ -247,7 +247,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -267,25 +278,14 @@ 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/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/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 \
@@ -301,8 +301,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -341,7 +340,6 @@ realclean: clean
  $(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 \
@@ -500,7 +498,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -520,25 +529,14 @@ 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/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/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 \
@@ -554,8 +552,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -594,7 +591,6 @@ realclean: clean
  $(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 \
@@ -759,7 +755,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -779,25 +786,14 @@ 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/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/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 \
@@ -813,8 +809,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -853,7 +848,6 @@ realclean: clean
  $(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 \
@@ -1031,7 +1025,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1051,25 +1056,14 @@ 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/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/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 \
@@ -1085,8 +1079,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1125,7 +1118,6 @@ realclean: clean
  $(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 \
@@ -1352,7 +1344,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1372,25 +1375,14 @@ 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/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/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 \
@@ -1406,8 +1398,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1425,7 +1416,6 @@ realclean: clean
  $(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 \
@@ -1595,7 +1585,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1615,25 +1616,14 @@ 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/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/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 \
@@ -1649,8 +1639,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1689,7 +1678,6 @@ realclean: clean
  $(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 \
@@ -1911,7 +1899,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1931,25 +1930,14 @@ 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/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/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 \
@@ -1965,8 +1953,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1984,7 +1971,6 @@ realclean: clean
  $(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 \
@@ -2144,7 +2130,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2164,25 +2161,14 @@ 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/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/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 \
@@ -2198,8 +2184,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2238,7 +2223,6 @@ realclean: clean
  $(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 \
@@ -2441,7 +2425,16 @@ realclean: clean
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
  $(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 \
@@ -2463,21 +2456,12 @@ realclean: clean
  $(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/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 \
@@ -2493,8 +2477,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2512,7 +2495,6 @@ realclean: clean
  $(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 \
@@ -2757,7 +2739,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2777,25 +2770,14 @@ 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/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/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 \
@@ -2811,8 +2793,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2830,7 +2811,6 @@ realclean: clean
  $(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 \
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 0d8a073a6a9..55277688f16 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -111,7 +111,7 @@ public:
   // Barrier for the multiple clients to synchronize after binding to
   // the servants.
 
-  const char *key_;
+  CORBA::String key_;
   // All cubit objects will have this as prefix to its key.
 
   u_int loop_count_;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index f27c6c029f9..818fba8d284 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -20,7 +20,6 @@ Cubit_i::~Cubit_i (void)
 CORBA::Octet
 Cubit_i::cube_octet (CORBA::Octet o,
                      CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Octet) (o * o * o);
 }
@@ -28,7 +27,6 @@ Cubit_i::cube_octet (CORBA::Octet o,
 CORBA::Short
 Cubit_i::cube_short (CORBA::Short s,
                      CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Short) (s * s * s);
 }
@@ -36,7 +34,6 @@ Cubit_i::cube_short (CORBA::Short s,
 CORBA::Long
 Cubit_i::cube_long (CORBA::Long l,
                     CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Long) (l * l * l);
 }
@@ -44,7 +41,6 @@ Cubit_i::cube_long (CORBA::Long l,
 Cubit::Many
 Cubit_i::cube_struct (const Cubit::Many &values,
                       CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Cubit::Many out_values;
 
@@ -57,13 +53,11 @@ Cubit_i::cube_struct (const Cubit::Many &values,
 
 void
 Cubit_i::noop (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // does nothing.
 }
 
 void Cubit_i::shutdown (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%t) Calling orb ()->shutdown ()\n"));
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index 1c8f2cad34d..6ca11a8254f 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -30,26 +30,20 @@ public:
   ~Cubit_i (void);
 
   virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
 
   virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
 
   virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                 CORBA::Environment &env);
 
   virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
 
-  virtual void noop (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void noop (CORBA::Environment &env);
 
-  virtual void shutdown (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (CORBA::Environment &env);
 
   virtual PortableServer::POA_ptr
       _default_POA (CORBA::Environment &ACE_TRY_ENV);
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 c1b8d3a5f4a..644a653712f 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
@@ -7,8 +7,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 $usage = "run_tests.pl [-l suppress -ORBgioplite] [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n";
 
-use lib "../../../../../bin";
-require ACEutils;
+unshift @INC, '../../../../../bin';
+require Process;
 
 $iorfile = "mtcubit.ior";
 $sleeptime = 3;
@@ -51,36 +51,20 @@ while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
 
 $threads = $low_priority_threads + 1;
 
-# Make sure the file is gone, so we can wait on it.
-unlink $iorfile;
-
 $SV = Process::Create ('.' . $DIR_SEPARATOR . "server" . $Process::EXE_EXT,
                        " $gioplite $thread_per_rate -f $iorfile -t $threads");
 
 sleep $sleeptime;
 
-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 ('.' . $DIR_SEPARATOR . "client" . $Process::EXE_EXT .
+$status = system ('.' . $DIR_SEPARATOR . "client" . $Process::EXE_EXT .
                   " $gioplite $thread_per_rate " .
                   "-f $iorfile -n $iterations -t $threads");
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
 
-$SV->Terminate (); $server = $SV->TimedWait (10);
-if ($server == -1) {
-  print STDERR "ERROR: server could not be terminated\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+# @@ TODO change to Wait() once the -x option works.
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
-exit $client == 0  ?  0  :  1;
+# @@ Capture any errors from the server too.
+exit $status;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index a7d75263f9e..395ddc86c18 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -179,13 +179,12 @@ Server::activate_high_servant (void)
                    GLOBALS::instance ()->hostname,
                    GLOBALS::instance ()->base_port);
 
-  char *high_second_argv[] =
-    {orbendpoint,
-     ACE_const_cast (char *, "-ORBsndsock 32768 "),
-     ACE_const_cast (char *, "-ORBrcvsock 32768 "),
-     0};
+  char *high_second_argv[] = {orbendpoint,
+                              "-ORBsndsock 32768 ",
+                              "-ORBrcvsock 32768 ",
+                              0};
   ACE_NEW_RETURN (this->high_argv_,
-                  ACE_ARGV (this->argv_, high_second_argv),
+                  ACE_ARGV (this->argv_,high_second_argv),
                   -1);
   ACE_NEW_RETURN (this->high_priority_task_,
                   Cubit_Task (this->high_argv_->buf (),
@@ -251,11 +250,10 @@ Server::activate_low_servants (void)
                        ? (int) 0
                        : GLOBALS::instance ()->base_port + i);
 
-      char *low_second_argv[] =
-        {orbendpoint,
-         ACE_const_cast (char *, "-ORBsndsock 32768 "),
-         ACE_const_cast (char *, "-ORBrcvsock 32768 "),
-         0};
+      char *low_second_argv[] = {orbendpoint,
+                                 "-ORBsndsock 32768 ",
+                                 "-ORBrcvsock 32768 ",
+                                 0};
       ACE_NEW_RETURN (this->low_argv_,
                       ACE_ARGV (this->argv_,
                                 low_second_argv),
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index 2dcac6ab6e6..bc5a4a453fa 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator tss"
-static Client_Strategy_Factory "-ORBIIOPProfileLock null -ORBClientConnectionHandler RW"
-static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBConnectorLock null -ORBAllowReactivationOfSystemids 0"
+static Resource_Factory "-ORBresources tss -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/POA/Object_Creation_And_Registration/Makefile b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
index 9339a325dfd..0f30bfb916a 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
@@ -196,7 +196,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -216,25 +227,14 @@ 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/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/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 \
@@ -250,8 +250,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -290,7 +289,6 @@ realclean: clean
  $(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 \
@@ -449,7 +447,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -469,25 +478,14 @@ 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/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/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 \
@@ -503,8 +501,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -543,7 +540,6 @@ realclean: clean
  $(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 \
@@ -702,7 +698,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -722,25 +729,14 @@ 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/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/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 \
@@ -756,8 +752,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -796,7 +791,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf
index 57d256acaf7..3b74c04dbcc 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf
@@ -1,6 +1,2 @@
-# $Id$
-#
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
+static Server_Strategy_Factory "-ORBpoalock null -ORBtablesize 1001"
 
-static Server_Strategy_Factory "-ORBActiveObjectMapSize 1001"
diff --git a/TAO/performance-tests/Pluggable/Makefile b/TAO/performance-tests/Pluggable/Makefile
index a17f8d5ae17..8cd18987e1b 100644
--- a/TAO/performance-tests/Pluggable/Makefile
+++ b/TAO/performance-tests/Pluggable/Makefile
@@ -217,7 +217,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -237,25 +248,14 @@ 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/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/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 \
@@ -271,8 +271,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -311,7 +310,6 @@ realclean: clean
  $(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 \
@@ -471,7 +469,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -491,25 +500,14 @@ 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/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/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 \
@@ -525,8 +523,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -565,7 +562,6 @@ realclean: clean
  $(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 \
@@ -730,7 +726,16 @@ realclean: clean
  $(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 \
@@ -752,21 +757,12 @@ realclean: clean
  $(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/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 \
@@ -782,8 +778,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -822,7 +817,6 @@ realclean: clean
  $(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 \
@@ -988,7 +982,16 @@ realclean: clean
  $(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 \
@@ -1010,21 +1013,12 @@ realclean: clean
  $(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/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 \
@@ -1040,8 +1034,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1080,7 +1073,6 @@ realclean: clean
  $(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 \
@@ -1246,7 +1238,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1266,25 +1269,14 @@ 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/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/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 \
@@ -1300,8 +1292,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1340,7 +1331,6 @@ realclean: clean
  $(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 \
@@ -1504,7 +1494,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1524,25 +1525,14 @@ 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/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/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 \
@@ -1558,8 +1548,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1598,7 +1587,6 @@ realclean: clean
  $(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 \
@@ -1759,7 +1747,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1779,25 +1778,14 @@ 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/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/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 \
@@ -1813,8 +1801,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1853,7 +1840,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index c9fa75b0a74..84c09c6b6a1 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -27,8 +27,7 @@ PP_Test_Server::parse_args (void)
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), 
-                            -1);
+                             get_opts.optarg), -1);
         break;
       case '?':
       default:
@@ -38,7 +37,7 @@ PP_Test_Server::parse_args (void)
                            " [-o] <ior_output_file>"
                            "\n",
                            argv_ [0]),
-                          -1);
+                          1);
       }
 
   // Indicates successful parsing of command line.
@@ -64,11 +63,9 @@ PP_Test_Server::init (int argc,
   this->argc_ = argc;
   this->argv_ = argv;
 
-  if (this->parse_args () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "parse_args"),
-                      -1);
+  this->parse_args ();
+  // @@ Check for the return value here.
+
   // Get the orb
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
index b1127f11a31..e53c0b48dfd 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
@@ -73,7 +73,6 @@ Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void)
 
 Pluggable_Test_ptr
 Pluggable_Test_Factory_i::make_pluggable_test (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START);
   return my_pluggable_test_._this (env);
@@ -96,7 +95,6 @@ PP_Test_i::~PP_Test_i (void)
 
 void
 PP_Test_i::send_oneway (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START);
 }
@@ -105,7 +103,6 @@ PP_Test_i::send_oneway (CORBA::Environment &)
 
 void
 PP_Test_i::send_void (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START);
 }
@@ -113,7 +110,6 @@ PP_Test_i::send_void (CORBA::Environment &)
 // Shutdown.
 
 void PP_Test_i::shutdown (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s\n",
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h
index 7950a0fb248..02687f34a64 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.h
@@ -34,16 +34,13 @@ public:
   ~PP_Test_i (void);
   // Destructor
 
-  virtual void send_oneway (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_oneway (CORBA::Environment &env);
   // Test a oneway call.
 
-  virtual void send_void (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_void (CORBA::Environment &env);
   // Test a twoway call.
 
-  virtual void shutdown (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (CORBA::Environment &env);
   // Shutdown routine.
 
 protected:
@@ -65,8 +62,7 @@ public:
   ~Pluggable_Test_Factory_i (void);
   // Destructor.
 
-  virtual Pluggable_Test_ptr make_pluggable_test (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Pluggable_Test_ptr make_pluggable_test (CORBA::Environment &env);
   // Make a Pluggable Test object.
 
 private:
diff --git a/TAO/performance-tests/Thruput/TAO/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile
index b1c5b0cc119..707bc3512f9 100644
--- a/TAO/performance-tests/Thruput/TAO/Makefile
+++ b/TAO/performance-tests/Thruput/TAO/Makefile
@@ -209,7 +209,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -229,25 +240,14 @@ 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/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/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 \
@@ -263,8 +263,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -303,7 +302,6 @@ realclean: clean
  $(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 \
@@ -462,7 +460,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -482,25 +491,14 @@ 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/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/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 \
@@ -516,8 +514,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -556,7 +553,6 @@ realclean: clean
  $(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 \
@@ -720,7 +716,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -740,25 +747,14 @@ 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/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/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 \
@@ -774,8 +770,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -814,7 +809,6 @@ realclean: clean
  $(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 \
@@ -979,7 +973,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -999,25 +1004,14 @@ 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/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/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 \
@@ -1033,8 +1027,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1073,7 +1066,6 @@ realclean: clean
  $(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 \
@@ -1240,7 +1232,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1260,25 +1263,14 @@ 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/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/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 \
@@ -1294,8 +1286,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1334,7 +1325,6 @@ realclean: clean
  $(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 \
@@ -1493,7 +1483,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1513,25 +1514,14 @@ 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/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/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 \
@@ -1547,8 +1537,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1587,7 +1576,6 @@ realclean: clean
  $(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 \
@@ -1751,7 +1739,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1771,25 +1770,14 @@ 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/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/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 \
@@ -1805,8 +1793,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1845,7 +1832,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/performance-tests/Thruput/TAO/svc.conf b/TAO/performance-tests/Thruput/TAO/svc.conf
index d6c7074dd38..4f71ac35709 100644
--- a/TAO/performance-tests/Thruput/TAO/svc.conf
+++ b/TAO/performance-tests/Thruput/TAO/svc.conf
@@ -1,4 +1,5 @@
 # $Id$
 #
-
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection "
+static Resource_Factory "-ORBresources global"
+static Client_Strategy_Factory ""
+static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 9906e5a9cc0..6c57b7e43e4 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -57,6 +57,11 @@ TAO_Acceptor_Registry::make_mprofile (const TAO_ObjectKey &object_key,
 int
 TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile)
 {
+  // @@ Fred&Ossama: we should optimize this: we loop over the
+  // profiles here and in the ORB::is_collocated() method, maybe we
+  // should return the index of the profile that matched?  What
+  // happens if the address matches but the object key does not?
+  // Should we keep on searching in the ORB loop?
 
   TAO_AcceptorSetItor end = this->end ();
 
@@ -68,7 +73,6 @@ TAO_Acceptor_Registry::is_collocated (const TAO_MProfile &mprofile)
         {
           const TAO_Profile *profile = mprofile.get_profile (j);
 
-          // Check the address for equality.
           if ((*i)->tag () == profile->tag ()
               && (*i)->is_collocated (profile))
             return 1;
@@ -117,10 +121,8 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
                           -1);
       ACE_CString prefix = iop.substring (0, slot);
 
-      // IOP://address1,address2//
-      //    ^ slot
-      // check for the presence of addresses.  Get length and subtract
-      // 3 for the three chars ://
+      // @@ Fred, please document where the major number "3" comes
+      // from.
       if (slot == ACE_static_cast (int, iop.length () - 3))
         {
           // Protocol was specified without an endpoint.  According to
@@ -133,12 +135,13 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
           continue;
         }
 
-      // increment slot past the "://" (i.e. add 3)
+      // @@ Fred, please document where the major number "3" comes
+      // from.
       ACE_CString addrs  = iop.substring (slot + 3);
 
       if (addrs [addrs.length () - 1] == '/')
         // Get rid of trailing '/'.
-        addrs [addrs.length () - 1] = '\0';
+        addrs [addrs.length () - 1] = '\0'; 
 
       char *last_addr=0;
       addr_str.reset (addrs.rep ());
@@ -168,29 +171,22 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
                     (*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.
                       // At some point in the future it may become
                       // useful.
-                      int major = -1;
-                      int minor = -1;
                       const char *temp_iop = address.c_str ();
-                      if (isdigit (temp_iop[0])
-                          && temp_iop[1] == '.'
-                          && isdigit (temp_iop[2])
+                      if (isdigit (temp_iop[0]) 
+                          && temp_iop[1] == '.' 
+                          && isdigit (temp_iop[2]) 
                           && temp_iop[3] == '@')
-                        {
-                          major = temp_iop[0] - '0';
-                          minor = temp_iop[2] - '0';
-                          address = address.substring (4);
-                        }
+                        address = address.substring (4);
+
+                      // add acceptor to list.
+                      this->acceptors_.insert (acceptor);
 
                       if (acceptor->open (orb_core,
-                                          major, minor,
                                           address) == -1)
                         return -1;
                       break;
@@ -210,8 +206,6 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core)
   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,
                                      ACE_CString *protocol_prefix)
@@ -222,7 +216,9 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
   TAO_ProtocolFactorySetItor end =
     orb_core->protocol_factories ()->end ();
 
-  // loop through loaded protocols looking for protocol_prefix
+  // @@ Fred, there should be more comments in this method so that
+  // people can tell what's going on...  Can you please fix it?
+
   for (TAO_ProtocolFactorySetItor i =
          orb_core->protocol_factories ()->begin ();
        i != end;
@@ -245,7 +241,6 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
             }
         }
 
-      // got it, make an acceptor
       TAO_Acceptor *acceptor =
         (*i)->factory ()->make_acceptor ();
 
@@ -259,9 +254,6 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
           continue;
         }
 
-      // 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)
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index 19fd16bc9d4..7b6db0eabe6 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -50,7 +50,6 @@ class TAO_Export TAO_Acceptor_Registry
   // = DESCRIPTION
   //   This class maintains a list os acceptor factories
   //   for all loaded ORB protocols.
-  //   There is one Acceptor_Registry per ORB_Core.
 public:
   // = Initialization and termination methods.
   TAO_Acceptor_Registry (void);
@@ -59,8 +58,27 @@ public:
   ~TAO_Acceptor_Registry (void);
   //  Default destructor.
 
+  // @@ Fred, should this method be removed?  If so, where should the
+  // comments be put?
+
+  // virtual TAO_Acceptor *acceptor (const char *endpoint) = 0;
+  // Create a new acceptor from an endpoint specification, if
+  // the specification is not recognized then we return 0.
+  // Each protocol will be characterized by a prefix, so
+  // endpoints will be specified as:
+  // "iiop://macarena:0" - IIOP on macarena, port <any>
+  // "uiop:///foo/bar"   - GIOP over unix domain, file /foo/bar
+  // "iiop://localhost:0" - IIOP, sap_any [any better idea?]
+  // "aal5giop:......"   - GIOP over AAL5, how to specify the
+  //                       end point?
+  // this format is extensible, for example:
+  // "rtiiop://macarena:0,15" - real-time IIOP, host, port, prio.
+
   int open (TAO_ORB_Core *orb_core);
   // Initialize all registered acceptors.  Return -1 on error.
+  // @@ Fred&Ossama: What is the relationship between the ORB_Core and
+  // the Acceptor_Registry? Is there just one per orb core? Should tbe
+  // acceptor registry know which ORB_Core it belongs to?
 
   int close_all (void);
   // Close all open acceptors.
diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/Active_Object_Map.h
index bb5a2329475..3b0a834d816 100644
--- a/TAO/tao/Active_Object_Map.h
+++ b/TAO/tao/Active_Object_Map.h
@@ -53,20 +53,12 @@ public:
     Map_Entry (void);
     // Default constructor.
 
+    // @@ Irfan, can you please add a comment for each of these fields?
     PortableServer::ObjectId user_id_;
-    // User id.
-
     PortableServer::ObjectId system_id_;
-    // System id.
-
     PortableServer::Servant servant_;
-    // Servant.
-
     CORBA::UShort reference_count_;
-    // Reference count on outstanding requests on this servant.
-
     CORBA::Boolean deactivated_;
-    // Has this servant been deactivated already?
   };
 
   TAO_Active_Object_Map (int user_id_policy,
@@ -492,26 +484,21 @@ public:
   virtual ~TAO_Id_Hint_Strategy (void);
   // Virtual destructor.
 
+  // @@ Irfan, can you please add comments to these methods.
   virtual int recover_key (const PortableServer::ObjectId &system_id,
                            PortableServer::ObjectId &user_id) = 0;
-  // Find the user id from the system id.
 
   virtual int bind (TAO_Active_Object_Map::Map_Entry &entry) = 0;
-  // Add to map.
 
   virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry) = 0;
-  // Remove from map.
 
   virtual int find (const PortableServer::ObjectId &system_id,
                     TAO_Active_Object_Map::Map_Entry *&entry) = 0;
-  // Find system id.
 
   virtual size_t hint_size (void) = 0;
-  // How big is the hint generated by this strategy?
 
   virtual int system_id (PortableServer::ObjectId_out system_id,
                          TAO_Active_Object_Map::Map_Entry &entry) = 0;
-  // Get the system id associated with this entry.
 };
 
 class TAO_Active_Hint_Strategy : public TAO_Id_Hint_Strategy
@@ -522,6 +509,7 @@ class TAO_Active_Hint_Strategy : public TAO_Id_Hint_Strategy
   // = DESCRIPTION
   //     Strategy for adding active hints to ids.
 public:
+  // @@ Irfan, can you please add comments to these methods.
   TAO_Active_Hint_Strategy (CORBA::ULong map_size);
 
   virtual ~TAO_Active_Hint_Strategy (void);
@@ -558,6 +546,7 @@ class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy
   // = DESCRIPTION
   //     Strategy for not adding active hints to ids.
 public:
+  // @@ Irfan, can you please add comments to these methods.
   virtual ~TAO_No_Hint_Strategy (void);
   // Virtual destructor.
 
diff --git a/TAO/tao/Active_Object_Map.i b/TAO/tao/Active_Object_Map.i
index 4dcfd2777a6..569a95b6b1a 100644
--- a/TAO/tao/Active_Object_Map.i
+++ b/TAO/tao/Active_Object_Map.i
@@ -6,6 +6,9 @@ TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant)
   return this->id_uniqueness_strategy_->is_servant_in_map (servant);
 }
 
+// @@ Irfan, a lot of these methods are rather large -- should we
+// really be trying to inline them all?!
+
 ACE_INLINE int
 TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_id)
 {
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 7cbaf651725..f407c9f8aac 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -844,11 +844,7 @@ CORBA_Any::operator>>= (to_object obj) const
     {
       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_);
-
+          obj.ref_ = *(CORBA::Object_ptr *) this->value_;
           return 1;
         }
       else
@@ -861,13 +857,18 @@ CORBA_Any::operator>>= (to_object obj) const
                                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_.
+                                                &obj.ref_, 0, env)
+                                 == CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1:0;
+          if (flag)
+            {
+              CORBA::Object_ptr *tmp = new CORBA::Object_ptr;
+              *tmp = obj.ref_;
+              ACE_const_cast (CORBA_Any *,
+                              this)->value_ = tmp;
+              return 1;
+            }
+          // we own this allocated value
+          //          this->value_ = obj.ref_;
           return flag;
         }
     }
@@ -914,6 +915,8 @@ CORBA_Any_var::operator= (CORBA::Any *p)
 CORBA::Any_var &
 CORBA_Any_var::operator= (const CORBA::Any_var& r)
 {
+  // @@ Jeff, if this call can fail then maybe we shouldn't be returning
+  // Any_var & but instead be making this a "void" function?
   CORBA_Any_ptr tmp;
 
   ACE_NEW_RETURN (tmp,
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
deleted file mode 100644
index 64ef31c26b4..00000000000
--- a/TAO/tao/CONV_FRAME.pidl
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-#pragma prefix "omg.org"
-
-module CONV_FRAME {
-  typedef unsigned long CodeSetId;
-
-  struct CodeSetComponent {
-     CodeSetId native_code_set;
-     sequence<CodeSetId> conversion_code_sets;
-  };
-
-  struct CodeSetComponentInfo {
-     CodeSetComponent ForCharData;
-     CodeSetComponent ForWcharData;
-  };
-
-  struct CodeSetContext {
-     CodeSetId char_data;
-     CodeSetId wchar_data;
-  };
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
deleted file mode 100644
index 8b8974683a2..00000000000
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ /dev/null
@@ -1,494 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAME.cpp
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "CONV_FRAMEC.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-#include "CONV_FRAMEC.i"
-#endif /* !defined INLINE */
-
-static const CORBA::Long _oc_CONV_FRAME_CodeSetId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-  10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-  CORBA::tk_ulong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetId (CORBA::tk_alias, sizeof (_oc_CONV_FRAME_CodeSetId), (char *) &_oc_CONV_FRAME_CodeSetId, 0, sizeof (CONV_FRAME::CodeSetId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetId, &_tc_TAO_tc_CONV_FRAME_CodeSetId)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-  17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
-  2, // member count
-  16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
-
-
-  21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-  CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
-
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponent (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetComponent), (char *) &_oc_CONV_FRAME_CodeSetComponent, 0, sizeof (CONV_FRAME::CodeSetComponent));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetComponent, &_tc_TAO_tc_CONV_FRAME_CodeSetComponent)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
-
-  void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ULong* tmp = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (length);
-
-    if (this->buffer_ != 0)
-    {
-      CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (old);
-
-    }
-    this->buffer_ = tmp;
-  }
-
-  void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-
-    CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-
-    CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CS_
-
-// *************************************************************
-// CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId
-// *************************************************************
-
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (void)
-{}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max) // uses max size
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::_tao_seq_CodeSetId (const _tao_seq_CodeSetId &seq) // copy ctor
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId::~_tao_seq_CodeSetId (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7449), ACE_NTOHL (0x6e666f3a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0
-  21, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x496e666f), ACE_NTOHL (0x0),  // name = CodeSetComponentInfo
-  2, // member count
-  12, ACE_NTOHL (0x466f7243), ACE_NTOHL (0x68617244), ACE_NTOHL (0x61746100),  // name = ForCharData
-  CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
-    2, // member count
-    16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
-
-
-    21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-      0,
-
-
-  13, ACE_NTOHL (0x466f7257), ACE_NTOHL (0x63686172), ACE_NTOHL (0x44617461), ACE_NTOHL (0x0),  // name = ForWcharData
-  CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0
-    17, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0),  // name = CodeSetComponent
-    2, // member count
-    16, ACE_NTOHL (0x6e617469), ACE_NTOHL (0x76655f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657400),  // name = native_code_set
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-      10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-      CORBA::tk_ulong,
-
-
-    21, ACE_NTOHL (0x636f6e76), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5f63), ACE_NTOHL (0x6f64655f), ACE_NTOHL (0x73657473), ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-        10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-        CORBA::tk_ulong,
-
-
-      0,
-
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetComponentInfo), (char *) &_oc_CONV_FRAME_CodeSetComponentInfo, 0, sizeof (CONV_FRAME::CodeSetComponentInfo));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetComponentInfo, &_tc_TAO_tc_CONV_FRAME_CodeSetComponentInfo)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x6574436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetContext:1.0
-  15, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657443), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = CodeSetContext
-  2, // member count
-  10, ACE_NTOHL (0x63686172), ACE_NTOHL (0x5f646174), ACE_NTOHL (0x61000000),  // name = char_data
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
-
-
-  11, ACE_NTOHL (0x77636861), ACE_NTOHL (0x725f6461), ACE_NTOHL (0x74610000),  // name = wchar_data
-  CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f4e56), ACE_NTOHL (0x5f465241), ACE_NTOHL (0x4d452f43), ACE_NTOHL (0x6f646553), ACE_NTOHL (0x65744964), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-    10, ACE_NTOHL (0x436f6465), ACE_NTOHL (0x53657449), ACE_NTOHL (0x64000000),  // name = CodeSetId
-    CORBA::tk_ulong,
-
-
-};
-static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetContext (CORBA::tk_struct, sizeof (_oc_CONV_FRAME_CodeSetContext), (char *) &_oc_CONV_FRAME_CodeSetContext, 0, sizeof (CONV_FRAME::CodeSetContext));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CONV_FRAME)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_CodeSetContext, &_tc_TAO_tc_CONV_FRAME_CodeSetContext)
-TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, const CONV_FRAME::CodeSetComponent &_tao_elem) // copying
-{
-  CONV_FRAME::CodeSetComponent *_any_val;
-  ACE_NEW (_any_val, CONV_FRAME::CodeSetComponent (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetComponent, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponent *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetComponent, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponent *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CONV_FRAME::_tc_CodeSetComponent, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponent *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponent, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CONV_FRAME::_tc_CodeSetComponent, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CONV_FRAME::_tc_CodeSetComponent, _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 CONV_FRAME::CodeSetComponentInfo &_tao_elem) // copying
-{
-  CONV_FRAME::CodeSetComponentInfo *_any_val;
-  ACE_NEW (_any_val, CONV_FRAME::CodeSetComponentInfo (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetComponentInfo, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponentInfo *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetComponentInfo, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetComponentInfo *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CONV_FRAME::_tc_CodeSetComponentInfo, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetComponentInfo *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponentInfo, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CONV_FRAME::_tc_CodeSetComponentInfo, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CONV_FRAME::_tc_CodeSetComponentInfo, _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 CONV_FRAME::CodeSetContext &_tao_elem) // copying
-{
-  CONV_FRAME::CodeSetContext *_any_val;
-  ACE_NEW (_any_val, CONV_FRAME::CodeSetContext (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetContext, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CONV_FRAME::CodeSetContext *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CONV_FRAME::_tc_CodeSetContext, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetContext *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CONV_FRAME::_tc_CodeSetContext, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CONV_FRAME::CodeSetContext *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetContext, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CONV_FRAME::_tc_CodeSetContext, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CONV_FRAME::_tc_CodeSetContext, _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 CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &_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
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
deleted file mode 100644
index ccfed2dbb0b..00000000000
--- a/TAO/tao/CONV_FRAMEC.h
+++ /dev/null
@@ -1,368 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAMEC.h
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_CONV_FRAMEC_H
-#define TAO_CONV_FRAMEC_H
-
-#include "tao/CDR.h"
-#include "tao/Sequence.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 TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  CONV_FRAME
-{
-  typedef CORBA::ULong CodeSetId;
-  typedef CORBA::ULong_out CodeSetId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetId;
-
-  struct TAO_Export CodeSetComponent
-  {
-    CodeSetId native_code_set;
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-
-      class _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId : public TAO_Unbounded_Base_Sequence
-      {
-      public:
-        // = Initialization and termination methods.
-
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void); // Default constructor.
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release = 0);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs);
-        _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &operator= (const _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs);
-        virtual ~_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void); // Dtor.
-        // = Accessors.
-        CORBA::ULong &operator[] (CORBA::ULong i);
-        const CORBA::ULong &operator[] (CORBA::ULong i) const;
-        // = Static operations.
-        static CORBA::ULong *allocbuf (CORBA::ULong size);
-        static void freebuf (CORBA::ULong *buffer);
-        virtual void _allocate_buffer (CORBA::ULong length);
-        virtual void _deallocate_buffer (void);
-        // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-        CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-        const CORBA::ULong *get_buffer (void) const;
-        void replace (CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::ULong *data,
-          CORBA::Boolean release);
-      };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CH_
-
-    // *************************************************************
-    // _tao_seq_CodeSetId
-    // *************************************************************
-
-    class TAO_Export _tao_seq_CodeSetId : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-      _TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-      TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-    {
-    public:
-      _tao_seq_CodeSetId (void); // default ctor
-      _tao_seq_CodeSetId (CORBA::ULong max); // uses max size
-      _tao_seq_CodeSetId (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::ULong *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_CodeSetId (const _tao_seq_CodeSetId &); // copy ctor
-      ~_tao_seq_CodeSetId (void); // dtor
-    };
-    typedef _tao_seq_CodeSetId *_tao_seq_CodeSetId_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___VAR_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___VAR_CH_
-
-// *************************************************************
-    // class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var
-    // *************************************************************
-
-    class TAO_Export _tao_seq_CodeSetId_var
-    {
-    public:
-      _tao_seq_CodeSetId_var (void); // default constructor
-      _tao_seq_CodeSetId_var (_tao_seq_CodeSetId *);
-      _tao_seq_CodeSetId_var (const _tao_seq_CodeSetId_var &); // copy constructor
-      ~_tao_seq_CodeSetId_var (void); // destructor
-
-      _tao_seq_CodeSetId_var &operator= (_tao_seq_CodeSetId *);
-      _tao_seq_CodeSetId_var &operator= (const _tao_seq_CodeSetId_var &);
-      _tao_seq_CodeSetId *operator-> (void);
-      const _tao_seq_CodeSetId *operator-> (void) const;
-
-      operator const _tao_seq_CodeSetId &() const;
-      operator _tao_seq_CodeSetId &();
-      operator _tao_seq_CodeSetId &() const;
-      CodeSetId &operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
-      const _tao_seq_CodeSetId &in (void) const;
-      _tao_seq_CodeSetId &inout (void);
-      _tao_seq_CodeSetId *&out (void);
-      _tao_seq_CodeSetId *_retn (void);
-      _tao_seq_CodeSetId *ptr (void) const;
-
-    private:
-      _tao_seq_CodeSetId *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___OUT_CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID___OUT_CH_
-
-    class TAO_Export _tao_seq_CodeSetId_out
-    {
-    public:
-      _tao_seq_CodeSetId_out (_tao_seq_CodeSetId *&);
-      _tao_seq_CodeSetId_out (_tao_seq_CodeSetId_var &);
-      _tao_seq_CodeSetId_out (const _tao_seq_CodeSetId_out &);
-      _tao_seq_CodeSetId_out &operator= (const _tao_seq_CodeSetId_out &);
-      _tao_seq_CodeSetId_out &operator= (_tao_seq_CodeSetId *);
-      operator _tao_seq_CodeSetId *&();
-      _tao_seq_CodeSetId *&ptr (void);
-      _tao_seq_CodeSetId *operator-> (void);
-      CodeSetId &operator[] (CORBA::ULong index);
-
-    private:
-      _tao_seq_CodeSetId *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_CodeSetId_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    _tao_seq_CodeSetId conversion_code_sets;
-  };
-
-  class TAO_Export CodeSetComponent_var
-  {
-  public:
-    CodeSetComponent_var (void); // default constructor
-    CodeSetComponent_var (CodeSetComponent *);
-    CodeSetComponent_var (const CodeSetComponent_var &); // copy constructor
-    ~CodeSetComponent_var (void); // destructor
-
-    CodeSetComponent_var &operator= (CodeSetComponent *);
-    CodeSetComponent_var &operator= (const CodeSetComponent_var &);
-    CodeSetComponent *operator-> (void);
-    const CodeSetComponent *operator-> (void) const;
-
-    operator const CodeSetComponent &() const;
-    operator CodeSetComponent &();
-    operator CodeSetComponent &() const;
-    // in, inout, out, _retn
-    const CodeSetComponent &in (void) const;
-    CodeSetComponent &inout (void);
-    CodeSetComponent *&out (void);
-    CodeSetComponent *_retn (void);
-    CodeSetComponent *ptr (void) const;
-
-  private:
-    CodeSetComponent *ptr_;
-  };
-
-  class TAO_Export CodeSetComponent_out
-  {
-  public:
-    CodeSetComponent_out (CodeSetComponent *&);
-    CodeSetComponent_out (CodeSetComponent_var &);
-    CodeSetComponent_out (const CodeSetComponent_out &);
-    CodeSetComponent_out &operator= (const CodeSetComponent_out &);
-    CodeSetComponent_out &operator= (CodeSetComponent *);
-    operator CodeSetComponent *&();
-    CodeSetComponent *&ptr (void);
-    CodeSetComponent *operator-> (void);
-
-  private:
-    CodeSetComponent *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CodeSetComponent_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetComponent;
-
-  struct TAO_Export CodeSetComponentInfo
-  {
-    CodeSetComponent ForCharData;
-    CodeSetComponent ForWcharData;
-  };
-
-  class TAO_Export CodeSetComponentInfo_var
-  {
-  public:
-    CodeSetComponentInfo_var (void); // default constructor
-    CodeSetComponentInfo_var (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var (const CodeSetComponentInfo_var &); // copy constructor
-    ~CodeSetComponentInfo_var (void); // destructor
-
-    CodeSetComponentInfo_var &operator= (CodeSetComponentInfo *);
-    CodeSetComponentInfo_var &operator= (const CodeSetComponentInfo_var &);
-    CodeSetComponentInfo *operator-> (void);
-    const CodeSetComponentInfo *operator-> (void) const;
-
-    operator const CodeSetComponentInfo &() const;
-    operator CodeSetComponentInfo &();
-    operator CodeSetComponentInfo &() const;
-    // in, inout, out, _retn
-    const CodeSetComponentInfo &in (void) const;
-    CodeSetComponentInfo &inout (void);
-    CodeSetComponentInfo *&out (void);
-    CodeSetComponentInfo *_retn (void);
-    CodeSetComponentInfo *ptr (void) const;
-
-  private:
-    CodeSetComponentInfo *ptr_;
-  };
-
-  class TAO_Export CodeSetComponentInfo_out
-  {
-  public:
-    CodeSetComponentInfo_out (CodeSetComponentInfo *&);
-    CodeSetComponentInfo_out (CodeSetComponentInfo_var &);
-    CodeSetComponentInfo_out (const CodeSetComponentInfo_out &);
-    CodeSetComponentInfo_out &operator= (const CodeSetComponentInfo_out &);
-    CodeSetComponentInfo_out &operator= (CodeSetComponentInfo *);
-    operator CodeSetComponentInfo *&();
-    CodeSetComponentInfo *&ptr (void);
-    CodeSetComponentInfo *operator-> (void);
-
-  private:
-    CodeSetComponentInfo *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CodeSetComponentInfo_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
-
-  struct TAO_Export CodeSetContext
-  {
-    CodeSetId char_data;
-    CodeSetId wchar_data;
-  };
-
-  class TAO_Export CodeSetContext_var
-  {
-  public:
-    CodeSetContext_var (void); // default constructor
-    CodeSetContext_var (CodeSetContext *);
-    CodeSetContext_var (const CodeSetContext_var &); // copy constructor
-    ~CodeSetContext_var (void); // destructor
-
-    CodeSetContext_var &operator= (CodeSetContext *);
-    CodeSetContext_var &operator= (const CodeSetContext_var &);
-    CodeSetContext *operator-> (void);
-    const CodeSetContext *operator-> (void) const;
-
-    operator const CodeSetContext &() const;
-    operator CodeSetContext &();
-    operator CodeSetContext &() const;
-    // in, inout, out, _retn
-    const CodeSetContext &in (void) const;
-    CodeSetContext &inout (void);
-    CodeSetContext &out (void);
-    CodeSetContext _retn (void);
-    CodeSetContext *ptr (void) const;
-
-  private:
-    CodeSetContext *ptr_;
-  };
-
-  typedef CodeSetContext &CodeSetContext_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_CodeSetContext;
-
-
-}; // module CONV_FRAME
-
-void TAO_Export operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponent *&);
-void TAO_Export operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponentInfo*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponentInfo *&);
-void TAO_Export operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetContext &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContext*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponent &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-  );
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponentInfo &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponentInfo &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetContext &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "CONV_FRAMEC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_CONV_FRAMEC_H */
diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i
deleted file mode 100644
index 985bcc50e7c..00000000000
--- a/TAO/tao/CONV_FRAMEC.i
+++ /dev/null
@@ -1,883 +0,0 @@
-// $Id$
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (CONV_FRAME::CodeSetComponent *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::CodeSetComponent_var (const CONV_FRAME::CodeSetComponent_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CONV_FRAME::CodeSetComponent(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::~CodeSetComponent_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (CONV_FRAME::CodeSetComponent *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent_var &
-CONV_FRAME::CodeSetComponent_var::operator= (const CONV_FRAME::CodeSetComponent_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CONV_FRAME::CodeSetComponent (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator const CONV_FRAME::CodeSetComponent &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator CONV_FRAME::CodeSetComponent &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_var::operator CONV_FRAME::CodeSetComponent &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent &
-CONV_FRAME::CodeSetComponent_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent &
-CONV_FRAME::CodeSetComponent_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponent *&
-CONV_FRAME::CodeSetComponent_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::_retn (void)
-{
-  CONV_FRAME::CodeSetComponent *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CONV_FRAME::CodeSetComponent *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (CONV_FRAME::CodeSetComponent_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::CodeSetComponent_out (const CONV_FRAME::CodeSetComponent_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponent_out&,p).ptr_)
-{}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (const CONV_FRAME::CodeSetComponent_out &p)
-{
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponent_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent_out &
-CONV_FRAME::CodeSetComponent_out::operator= (CONV_FRAME::CodeSetComponent *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent_out::operator CONV_FRAME::CodeSetComponent *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *&
-CONV_FRAME::CodeSetComponent_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent *
-CONV_FRAME::CodeSetComponent_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::ULong[size];
-  }
-
-  ACE_INLINE void CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (CORBA::ULong *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (void) // Default constructor.
-  {
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (maximum))
-  {
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-
-  ACE_INLINE
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId (const CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ULong *tmp1 = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->maximum_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    this->buffer_ = tmp1;
-  }
-
-  ACE_INLINE CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator= (const CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-        CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-        this->buffer_ = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (rhs.maximum_);
-
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-    CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-
-    return *this;
-  }
-
-  // = Accessors.
-  ACE_INLINE CORBA::ULong &
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-    return tmp[i];
-  }
-
-  ACE_INLINE const CORBA::ULong &
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  ACE_INLINE CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ULong *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ULong*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-
-  ACE_INLINE const CORBA::ULong *
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-  }
-
-  ACE_INLINE void
-  CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::ULong *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-      CONV_FRAME::CodeSetComponent::_TAO_Unbounded_Sequence_CONV_FRAME_CodeSetComponent__tao_seq_CodeSetId::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CODESETID_CI_
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_tao_seq_CodeSetId_var (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::~_tao_seq_CodeSetId_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::_retn (void)
-{
-  CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::_tao_seq_CodeSetId_out (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out&,p).ptr_)
-{}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator= (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &p)
-{
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator= (CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *&
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetId &
-CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponentInfo_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (CONV_FRAME::CodeSetComponentInfo *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::CodeSetComponentInfo_var (const CONV_FRAME::CodeSetComponentInfo_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CONV_FRAME::CodeSetComponentInfo(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::~CodeSetComponentInfo_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (CONV_FRAME::CodeSetComponentInfo *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_var &
-CONV_FRAME::CodeSetComponentInfo_var::operator= (const CONV_FRAME::CodeSetComponentInfo_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CONV_FRAME::CodeSetComponentInfo (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator const CONV_FRAME::CodeSetComponentInfo &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator CONV_FRAME::CodeSetComponentInfo &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_var::operator CONV_FRAME::CodeSetComponentInfo &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetComponentInfo &
-CONV_FRAME::CodeSetComponentInfo_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo &
-CONV_FRAME::CodeSetComponentInfo_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *&
-CONV_FRAME::CodeSetComponentInfo_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::_retn (void)
-{
-  CONV_FRAME::CodeSetComponentInfo *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetComponentInfo_out
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CONV_FRAME::CodeSetComponentInfo *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (CONV_FRAME::CodeSetComponentInfo_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::CodeSetComponentInfo_out (const CONV_FRAME::CodeSetComponentInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CONV_FRAME::CodeSetComponentInfo_out&,p).ptr_)
-{}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (const CONV_FRAME::CodeSetComponentInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (CONV_FRAME::CodeSetComponentInfo_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo_out &
-CONV_FRAME::CodeSetComponentInfo_out::operator= (CONV_FRAME::CodeSetComponentInfo *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetComponentInfo_out::operator CONV_FRAME::CodeSetComponentInfo *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *&
-CONV_FRAME::CodeSetComponentInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetComponentInfo *
-CONV_FRAME::CodeSetComponentInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CONV_FRAME::CodeSetContext_var
-// *************************************************************
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (CONV_FRAME::CodeSetContext *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::CodeSetContext_var (const CONV_FRAME::CodeSetContext_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CONV_FRAME::CodeSetContext(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::~CodeSetContext_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (CONV_FRAME::CodeSetContext *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext_var &
-CONV_FRAME::CodeSetContext_var::operator= (const CONV_FRAME::CodeSetContext_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CONV_FRAME::CodeSetContext (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator const CONV_FRAME::CodeSetContext &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator CONV_FRAME::CodeSetContext &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CONV_FRAME::CodeSetContext_var::operator CONV_FRAME::CodeSetContext &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE CONV_FRAME::CodeSetContext &
-CONV_FRAME::CodeSetContext_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext
-CONV_FRAME::CodeSetContext_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CONV_FRAME::CodeSetContext *
-CONV_FRAME::CodeSetContext_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetComponent &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.native_code_set) &&
-    (strm << _tao_aggregate.conversion_code_sets)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetComponent &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.native_code_set) &&
-    (strm >> _tao_aggregate.conversion_code_sets)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.ForCharData) &&
-    (strm << _tao_aggregate.ForWcharData)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetComponentInfo &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.ForCharData) &&
-    (strm >> _tao_aggregate.ForWcharData)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CONV_FRAME::CodeSetContext &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.char_data) &&
-    (strm << _tao_aggregate.wchar_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CONV_FRAME::CodeSetContext &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.char_data) &&
-    (strm >> _tao_aggregate.wchar_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
diff --git a/TAO/tao/CONV_FRAMES.cpp b/TAO/tao/CONV_FRAMES.cpp
deleted file mode 100644
index 424daaee2ef..00000000000
--- a/TAO/tao/CONV_FRAMES.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAME.cpp
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "CONV_FRAMES.h"
-
-#if !defined (__ACE_INLINE__)
-#include "CONV_FRAMES.i"
-#endif /* !defined INLINE */
diff --git a/TAO/tao/CONV_FRAMES.h b/TAO/tao/CONV_FRAMES.h
deleted file mode 100644
index e0cd5f4a47c..00000000000
--- a/TAO/tao/CONV_FRAMES.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAME.cpp
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_CONV_FRAMES_H
-#define TAO_CONV_FRAMES_H
-
-#include "CONV_FRAMEC.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_CONV_FRAME
-{
-};
-
-#include "CONV_FRAMES_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "CONV_FRAMES.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_CONV_FRAMES_H */
diff --git a/TAO/tao/CONV_FRAMES.i b/TAO/tao/CONV_FRAMES.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/CONV_FRAMES.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/CONV_FRAMES_T.cpp b/TAO/tao/CONV_FRAMES_T.cpp
deleted file mode 100644
index 268c12f6c43..00000000000
--- a/TAO/tao/CONV_FRAMES_T.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAMES_T.h
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_CONV_FRAMES_T_CPP
-#define TAO_CONV_FRAMES_T_CPP
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "CONV_FRAMES_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "CONV_FRAMES_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* TAO_CONV_FRAMES_T_CPP */
diff --git a/TAO/tao/CONV_FRAMES_T.h b/TAO/tao/CONV_FRAMES_T.h
deleted file mode 100644
index a43d98b34c2..00000000000
--- a/TAO/tao/CONV_FRAMES_T.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   CONV_FRAMES_T.h
-//
-// = DESCRIPTION
-//   Generated from CONV_FRAME.pidl, that contains the OMG standarized
-//   CONV_FRAME module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_CONV_FRAMES_T_H
-#define TAO_CONV_FRAMES_T_H
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "CONV_FRAMES_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "CONV_FRAMES_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CONV_FRAMES_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_CONV_FRAMES_T_H */
diff --git a/TAO/tao/CONV_FRAMES_T.i b/TAO/tao/CONV_FRAMES_T.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/CONV_FRAMES_T.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 81fc65c296c..fdb041e5d2e 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -114,11 +114,13 @@ TAO_Connector_Registry::preconnect (TAO_EndpointSet &preconnections)
 }
 
 int
-TAO_Connector_Registry::connect (TAO_Profile *&profile,
+TAO_Connector_Registry::connect (TAO_Stub *&obj,
                                  TAO_Transport *&transport)
 {
+  TAO_Profile *profile = obj->profile_in_use ();
 
-  // Find the appropriate connector object
+  // Here is where we get the appropriate connector object but we are
+  // the Connector Registry so call get_connector(tag)
   TAO_Connector *connector =
     this->get_connector (profile->tag ());
 
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index e90b11acc09..294d34c12f8 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -52,10 +52,8 @@ class TAO_Export TAO_Connector_Registry
   //   Connector Registry and Generic Connector interface definitions.
   //   All loaded ESIOP or GIOP connector bridges must register with
   //   this object.
-  //   This class is able to dynamically load a set of
-  //   concrete protocol connectors which have registered with the service
-  //   configurator and added their Factory name to the Resource_Factory
-  //   line of the svc.comf file.
+  //   @@ Fred: this class should be able to dynamically load a set of
+  //            connectors using the service configurator.
 public:
   TAO_Connector_Registry (void);
   //  Default constructor.
@@ -76,7 +74,7 @@ public:
   // For this list of preconnections call the connector specific
   // preconnect method for each preconnection.
 
-  int connect (TAO_Profile *&profile, TAO_Transport *&transport);
+  int connect (TAO_Stub *&obj, TAO_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
diff --git a/TAO/tao/Context.cpp b/TAO/tao/Context.cpp
index 2f148196621..ed9b7ff2ee4 100644
--- a/TAO/tao/Context.cpp
+++ b/TAO/tao/Context.cpp
@@ -13,8 +13,20 @@
 # include "tao/Context.i"
 #endif /* ! __ACE_INLINE__ */
 
+CORBA::Boolean
+CORBA::is_nil (CORBA::Context_ptr ctx)
+{
+  return ctx == 0;
+}
+
+void
+CORBA::release (CORBA::Context_ptr ctx)
+{
+  if (ctx)
+    ctx->_decr_refcnt ();
+}
+
 CORBA_Context::CORBA_Context (void)
-  : refcount_ (1)
 {
 }
 
diff --git a/TAO/tao/Context.i b/TAO/tao/Context.i
index 92ec9a59340..dd2febd271a 100644
--- a/TAO/tao/Context.i
+++ b/TAO/tao/Context.i
@@ -5,19 +5,6 @@
 // These should never be non-NULL, but the method
 // is required of pseudo objects.
 
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Context_ptr ctx)
-{
-  return ctx == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::Context_ptr ctx)
-{
-  if (ctx)
-    ctx->_decr_refcnt ();
-}
-
 ACE_INLINE CORBA_Context*
 CORBA_Context::_duplicate (CORBA_Context* x)
 {
@@ -221,7 +208,7 @@ CORBA_ContextList::_nil (void)
 // default constructor
 
 ACE_INLINE
-CORBA_ContextList_var::CORBA_ContextList_var (void)
+CORBA_ContextList_var::CORBA_ContextList_var (void) 
   : ptr_ (CORBA_ContextList::_nil ())
 {}
 
@@ -238,7 +225,7 @@ CORBA_ContextList_var::ptr (void) const
 
 // copy constructor
 ACE_INLINE
-CORBA_ContextList_var::CORBA_ContextList_var (const CORBA_ContextList_var &p)
+CORBA_ContextList_var::CORBA_ContextList_var (const CORBA_ContextList_var &p) 
   : ptr_ (p.ptr_->_duplicate ())
 {}
 
diff --git a/TAO/tao/CurrentS.cpp b/TAO/tao/CurrentS.cpp
index cd5907ef82a..faa403a31aa 100644
--- a/TAO/tao/CurrentS.cpp
+++ b/TAO/tao/CurrentS.cpp
@@ -49,6 +49,20 @@ void* POA_CORBA::Current::_downcast (
   return 0;
 }
 
+void POA_CORBA::Current::_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)
+  {
+    env.exception (new CORBA_BAD_OPERATION ());
+    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+  }
+else
+    skel (req, this, context, env);
+}
+
 const char* POA_CORBA::Current::_interface_repository_id (void) const
 {
   return "IDL:CORBA/Current:1.0";
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 91ca9eec8a3..a65736ba3a1 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -81,7 +81,7 @@ CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -196,7 +196,7 @@ void CORBA::ConstructionPolicy::make_domain_manager (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    ACE_THROW (CORBA::INV_OBJREF ());
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -268,21 +268,21 @@ CORBA_DomainManagerList::CORBA_DomainManagerList (void)
 {}
 
 CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> (max)
+  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager> (max)
 {}
 
 CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max,
                                                   CORBA::ULong length,
                                                   CORBA_DomainManager_ptr *buffer,
                                                   CORBA::Boolean release)
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> (max,
+  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager> (max,
                                                         length,
                                                         buffer,
                                                         release)
 {}
 
 CORBA_DomainManagerList::CORBA_DomainManagerList (const CORBA_DomainManagerList &seq) // copy ctor
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var> (seq)
+  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager> (seq)
 {}
 
 CORBA_DomainManagerList::~CORBA_DomainManagerList (void) // dtor
@@ -340,12 +340,12 @@ 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>;
-  template class TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>;
-  template class TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var>;
+  template class TAO_Unbounded_Object_Sequence<CORBA_DomainManager>;
+  template class TAO_Object_Manager<CORBA_DomainManager>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 # 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>
+# pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_DomainManager>
+# pragma instantiate TAO_Object_Manager<CORBA_DomainManager>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #if ! defined (TAO_HAS_MINIMUM_CORBA)
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 454cf84253c..d618b37ef80 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -120,7 +120,7 @@ private:
 // DomainManagerList
 // *************************************************************
 
-class TAO_Export CORBA_DomainManagerList : public TAO_Unbounded_Object_Sequence<CORBA_DomainManager,CORBA_DomainManager_var>
+class TAO_Export CORBA_DomainManagerList : public TAO_Unbounded_Object_Sequence<CORBA_DomainManager>
 {
 public:
   CORBA_DomainManagerList (void); // default ctor
@@ -158,7 +158,7 @@ public:
   operator CORBA_DomainManagerList &();
   operator CORBA_DomainManagerList &() const;
 
-  TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> operator[] (CORBA::ULong slot);
+  TAO_Object_Manager<CORBA_DomainManager> operator[] (CORBA::ULong slot);
   // in, inout, out, _retn
   const CORBA_DomainManagerList &in (void) const;
   CORBA_DomainManagerList &inout (void);
@@ -182,7 +182,7 @@ public:
   CORBA_DomainManagerList *&ptr (void);
   CORBA_DomainManagerList *operator-> (void);
 
-  TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> operator[] (CORBA::ULong slot);
+  TAO_Object_Manager<CORBA_DomainManager> operator[] (CORBA::ULong slot);
 
 private:
   CORBA_DomainManagerList *&ptr_;
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index 8b8215da41c..354178ddc80 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -446,7 +446,7 @@ CORBA_DomainManagerList_var::operator CORBA_DomainManagerList &() const// cast
   return *this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> 
+ACE_INLINE TAO_Object_Manager<CORBA_DomainManager> 
 CORBA_DomainManagerList_var::operator[] (CORBA::ULong slot)
 {
   return this->ptr_->operator[] (slot);
@@ -543,7 +543,7 @@ CORBA_DomainManagerList_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> 
+ACE_INLINE TAO_Object_Manager<CORBA_DomainManager> 
 CORBA_DomainManagerList_out::operator[] (CORBA::ULong slot)
 {
   return this->ptr_->operator[] (slot);
diff --git a/TAO/tao/DynAnyS.cpp b/TAO/tao/DynAnyS.cpp
index 34c8b64e844..845bcebe334 100644
--- a/TAO/tao/DynAnyS.cpp
+++ b/TAO/tao/DynAnyS.cpp
@@ -73,6 +73,12 @@ POA_CORBA::DynAny::_downcast (const char* logical_type_id)
   return 0;
 }
 
+void POA_CORBA::DynAny::_dispatch (CORBA::ServerRequest &,
+                                   void *,
+                                   CORBA::Environment &)
+{
+}
+
 const char*
 POA_CORBA::DynAny::_interface_repository_id (void) const
 {
@@ -634,6 +640,13 @@ POA_CORBA::DynEnum::_downcast (
   return 0;
 }
 
+void
+POA_CORBA::DynEnum::_dispatch (CORBA::ServerRequest &,
+                               void *,
+                               CORBA::Environment &)
+{
+}
+
 const char*
 POA_CORBA::DynEnum::_interface_repository_id (void) const
 {
@@ -780,6 +793,13 @@ POA_CORBA::DynStruct::_downcast (
   return 0;
 }
 
+void
+POA_CORBA::DynStruct::_dispatch (CORBA::ServerRequest &,
+                                 void *,
+                                 CORBA::Environment &)
+{
+}
+
 const char*
 POA_CORBA::DynStruct::_interface_repository_id (void) const
 {
@@ -924,6 +944,12 @@ POA_CORBA::DynUnion::_downcast (
   return 0;
 }
 
+void POA_CORBA::DynUnion::_dispatch (CORBA::ServerRequest &,
+                                    void *,
+                                    CORBA::Environment &)
+{
+}
+
 const char* POA_CORBA::DynUnion::_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynUnion:1.0";
@@ -1107,6 +1133,13 @@ POA_CORBA::DynSequence::_downcast (
   return 0;
 }
 
+void
+POA_CORBA::DynSequence::_dispatch (CORBA::ServerRequest &,
+                                   void *,
+                                   CORBA::Environment &)
+{
+}
+
 const char*
 POA_CORBA::DynSequence::_interface_repository_id (void) const
 {
@@ -1251,6 +1284,13 @@ POA_CORBA::DynArray::_downcast (
   return 0;
 }
 
+void
+POA_CORBA::DynArray::_dispatch (CORBA::ServerRequest &,
+                                void *,
+                                CORBA::Environment &)
+{
+}
+
 const char*
 POA_CORBA::DynArray::_interface_repository_id (void) const
 {
diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp
index 0b3ce30f6c0..07ca4e544f3 100644
--- a/TAO/tao/DynArray_i.cpp
+++ b/TAO/tao/DynArray_i.cpp
@@ -25,7 +25,7 @@
 
 TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any)
   : type_ (any.type ()),
-    current_index_ (0),
+    index_ (0),
     da_members_ (0)
 {
   CORBA::Environment env;
@@ -72,7 +72,7 @@ TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any)
 
 TAO_DynArray_i::TAO_DynArray_i (CORBA_TypeCode_ptr tc)
   : type_ (CORBA::TypeCode::_duplicate (tc)),
-    current_index_ (0),
+    index_ (0),
     da_members_ (0)
 {
   CORBA::Environment env;
@@ -306,11 +306,11 @@ TAO_DynArray_i::current_component (CORBA::Environment &env)
   if (this->da_members_.size () == 0)
     return 0;
 
-  if (!this->da_members_[this->current_index_].in ())
-    this->da_members_[this->current_index_] =
+  if (!this->da_members_[this->index_].in ())
+    this->da_members_[this->index_] =
       TAO_DynAny_i::create_dyn_any (this->get_element_type (env),
                                     env);
-  return this->da_members_[this->current_index_].in ();
+  return this->da_members_[this->index_].in ();
 }
 
 CORBA::Boolean
@@ -318,10 +318,10 @@ TAO_DynArray_i::next (CORBA::Environment &)
 {
   CORBA::Long size = (CORBA::Long) this->da_members_.size ();
 
-  if (size == 0 || this->current_index_ + 1 == size)
+  if (size == 0 || this->index_ + 1 == size)
     return 0;
 
-  ++this->current_index_;
+  ++this->index_;
   return 1;
 }
 
@@ -332,14 +332,14 @@ TAO_DynArray_i::seek (CORBA::Long slot,
   if (slot < 0 || slot >= (CORBA::Long) this->da_members_.size ())
     return 0;
 
-  this->current_index_ = slot;
+  this->index_ = slot;
   return 1;
 }
 
 void
 TAO_DynArray_i::rewind (CORBA::Environment &)
 {
-  this->current_index_ = 0;
+  this->index_ = 0;
 }
 
 // The insert-primitive and get-primitive functions are required by
@@ -585,7 +585,7 @@ CORBA::Boolean
 TAO_DynArray_i::get_boolean (CORBA::Environment &env)
 {
   CORBA::Boolean val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -607,7 +607,7 @@ CORBA::Octet
 TAO_DynArray_i::get_octet (CORBA::Environment &env)
 {
   CORBA::Octet val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -629,7 +629,7 @@ CORBA::Char
 TAO_DynArray_i::get_char (CORBA::Environment &env)
 {
   CORBA::Char val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -651,7 +651,7 @@ CORBA::Short
 TAO_DynArray_i::get_short (CORBA::Environment &env)
 {
   CORBA::Short val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -673,7 +673,7 @@ CORBA::UShort
 TAO_DynArray_i::get_ushort (CORBA::Environment &env)
 {
   CORBA::UShort val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -695,7 +695,7 @@ CORBA::Long
 TAO_DynArray_i::get_long (CORBA::Environment &env)
 {
   CORBA::Long val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -717,7 +717,7 @@ CORBA::ULong
 TAO_DynArray_i::get_ulong (CORBA::Environment &env)
 {
   CORBA::ULong val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -739,7 +739,7 @@ CORBA::Float
 TAO_DynArray_i::get_float (CORBA::Environment &env)
 {
   CORBA::Float val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -761,7 +761,7 @@ CORBA::Double
 TAO_DynArray_i::get_double (CORBA::Environment &env)
 {
   CORBA::Double val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -783,7 +783,7 @@ char *
 TAO_DynArray_i::get_string (CORBA::Environment &env)
 {
   CORBA::Char *val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -805,7 +805,7 @@ CORBA::Object_ptr
 TAO_DynArray_i::get_reference (CORBA::Environment &env)
 {
   CORBA_Object_ptr val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -827,7 +827,7 @@ CORBA::TypeCode_ptr
 TAO_DynArray_i::get_typecode (CORBA::Environment &env)
 {
   CORBA_TypeCode_ptr val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -853,7 +853,7 @@ TAO_DynArray_i::get_longlong (CORBA::Environment &env)
 #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 ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -875,7 +875,7 @@ CORBA::ULongLong
 TAO_DynArray_i::get_ulonglong (CORBA::Environment &env)
 {
   CORBA::ULongLong val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -897,7 +897,7 @@ CORBA::WChar
 TAO_DynArray_i::get_wchar (CORBA::Environment &env)
 {
   CORBA::WChar val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -919,7 +919,7 @@ CORBA::Any_ptr
 TAO_DynArray_i::get_any (CORBA::Environment &env)
 {
   CORBA_Any_ptr val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h
index 967c672a4f8..f09ab38ab29 100644
--- a/TAO/tao/DynArray_i.h
+++ b/TAO/tao/DynArray_i.h
@@ -150,7 +150,7 @@ private:
   CORBA::TypeCode_var type_;
   // Holds the typecode of the array
 
-  CORBA::Long current_index_;
+  CORBA::Long index_;
   // Slot of the current component
 
   ACE_Array_Base<CORBA_DynAny_var> da_members_;
diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp
index 5e3cb188216..5954e807854 100644
--- a/TAO/tao/DynSequence_i.cpp
+++ b/TAO/tao/DynSequence_i.cpp
@@ -25,7 +25,7 @@
 
 TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any)
   : type_ (any.type ()),
-    current_index_ (0),
+    index_ (0),
     da_members_ (0)
 {
   CORBA::Environment env;
@@ -79,7 +79,7 @@ TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any)
 
 TAO_DynSequence_i::TAO_DynSequence_i (CORBA_TypeCode_ptr tc)
   : type_ (CORBA::TypeCode::_duplicate (tc)),
-    current_index_ (0),
+    index_ (0),
     da_members_ (0)
 {
   CORBA::Environment env;
@@ -334,12 +334,12 @@ TAO_DynSequence_i::current_component (CORBA::Environment &env)
   if (this->da_members_.size () == 0)
     return 0;
 
-  if (!this->da_members_[this->current_index_].in ())
-    this->da_members_[this->current_index_] =
+  if (!this->da_members_[this->index_].in ())
+    this->da_members_[this->index_] =
       TAO_DynAny_i::create_dyn_any (this->get_element_type (env),
                                     env);
 
-  return this->da_members_[this->current_index_].in ();
+  return this->da_members_[this->index_].in ();
 }
 
 CORBA::Boolean
@@ -347,10 +347,10 @@ TAO_DynSequence_i::next (CORBA::Environment &)
 {
   CORBA::Long size = (CORBA::Long) this->da_members_.size ();
 
-  if (size == 0 || this->current_index_ + 1 == size)
+  if (size == 0 || this->index_ + 1 == size)
     return 0;
 
-  ++this->current_index_;
+  ++this->index_;
   return 1;
 }
 
@@ -361,14 +361,14 @@ TAO_DynSequence_i::seek (CORBA::Long slot,
   if (slot < 0 || slot >= (CORBA::Long) this->da_members_.size ())
     return 0;
 
-  this->current_index_ = slot;
+  this->index_ = slot;
   return 1;
 }
 
 void
 TAO_DynSequence_i::rewind (CORBA::Environment &)
 {
-  this->current_index_ = 0;
+  this->index_ = 0;
 }
 
 // The insert-primitive and get-primitive functions are required
@@ -614,7 +614,7 @@ CORBA::Boolean
 TAO_DynSequence_i::get_boolean (CORBA::Environment &env)
 {
   CORBA::Boolean val = 0;
-  CORBA_DynAny_ptr dp = this->da_members_[this->current_index_].in ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -637,7 +637,7 @@ TAO_DynSequence_i::get_octet (CORBA::Environment &env)
 {
   CORBA::Octet val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -660,7 +660,7 @@ TAO_DynSequence_i::get_char (CORBA::Environment &env)
 {
   CORBA::Char val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -683,7 +683,7 @@ TAO_DynSequence_i::get_short (CORBA::Environment &env)
 {
   CORBA::Short val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -706,7 +706,7 @@ TAO_DynSequence_i::get_ushort (CORBA::Environment &env)
 {
   CORBA::UShort val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -729,7 +729,7 @@ TAO_DynSequence_i::get_long (CORBA::Environment &env)
 {
   CORBA::Long val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -752,7 +752,7 @@ TAO_DynSequence_i::get_ulong (CORBA::Environment &env)
 {
   CORBA::ULong val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -775,7 +775,7 @@ TAO_DynSequence_i::get_float (CORBA::Environment &env)
 {
   CORBA::Float val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -798,7 +798,7 @@ TAO_DynSequence_i::get_double (CORBA::Environment &env)
 {
   CORBA::Double val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -821,7 +821,7 @@ TAO_DynSequence_i::get_string (CORBA::Environment &env)
 {
   CORBA::Char *val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -844,7 +844,7 @@ TAO_DynSequence_i::get_reference (CORBA::Environment &env)
 {
   CORBA_Object_ptr val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -867,7 +867,7 @@ TAO_DynSequence_i::get_typecode (CORBA::Environment &env)
 {
   CORBA_TypeCode_ptr val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -894,7 +894,7 @@ TAO_DynSequence_i::get_longlong (CORBA::Environment &env)
   CORBA::LongLong val = 0;
 #endif /* ! ACE_LACKS_LONGLONG_T */
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -917,7 +917,7 @@ TAO_DynSequence_i::get_ulonglong (CORBA::Environment &env)
 {
   CORBA::ULongLong val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -940,7 +940,7 @@ TAO_DynSequence_i::get_wchar (CORBA::Environment &env)
 {
   CORBA::WChar val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -963,7 +963,7 @@ TAO_DynSequence_i::get_any (CORBA::Environment &env)
 {
   CORBA_Any_ptr val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h
index beb6a5bd183..bac5bc18593 100644
--- a/TAO/tao/DynSequence_i.h
+++ b/TAO/tao/DynSequence_i.h
@@ -154,7 +154,7 @@ private:
   CORBA::TypeCode_var type_;
   // Holds the typecode of the Sequence
 
-  CORBA::Long current_index_;
+  CORBA::Long index_;
   // Index of the current component
 
   ACE_Array_Base<CORBA_DynAny_var> da_members_;
diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp
index 8e133933e40..131e385f668 100644
--- a/TAO/tao/DynStruct_i.cpp
+++ b/TAO/tao/DynStruct_i.cpp
@@ -25,7 +25,7 @@
 
 TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any)
   : type_ (any.type ()),
-    current_index_ (0),
+    index_ (0),
     da_members_ (0)
 {
   CORBA::Environment env;
@@ -74,7 +74,7 @@ TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any)
 
 TAO_DynStruct_i::TAO_DynStruct_i (CORBA_TypeCode_ptr tc)
   : type_ (CORBA::TypeCode::_duplicate (tc)),
-    current_index_ (0),
+    index_ (0),
     da_members_ (0)
 {
   CORBA::Environment env;
@@ -105,14 +105,14 @@ TAO_DynStruct_i::~TAO_DynStruct_i (void)
 CORBA::FieldName
 TAO_DynStruct_i::current_member_name (CORBA::Environment &)
 {
-  return CORBA::string_dup (this->type_.in ()->member_name (this->current_index_));
+  return CORBA::string_dup (this->type_.in ()->member_name (this->index_));
 }
 
 // Returns the unaliased TCKind.
 CORBA::TCKind
 TAO_DynStruct_i::current_member_kind (CORBA::Environment& env)
 {
-  return TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_,
+  return TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_,
                                                                 env),
                                 env);
 }
@@ -310,23 +310,23 @@ TAO_DynStruct_i::type (CORBA::Environment &)
 CORBA_DynAny_ptr
 TAO_DynStruct_i::current_component (CORBA::Environment &env)
 {
-  if (!this->da_members_[this->current_index_].in ())
-    this->da_members_[this->current_index_] =
+  if (!this->da_members_[this->index_].in ())
+    this->da_members_[this->index_] =
       TAO_DynAny_i::create_dyn_any 
-        (this->type_.in ()->member_type (this->current_index_,
+        (this->type_.in ()->member_type (this->index_,
                                          env),
          env);
 
-  return this->da_members_[this->current_index_].in ();
+  return this->da_members_[this->index_].in ();
 }
 
 CORBA::Boolean
 TAO_DynStruct_i::next (CORBA::Environment &)
 {
-  if (this->current_index_ + 1 == (CORBA::Long) this->da_members_.size ())
+  if (this->index_ + 1 == (CORBA::Long) this->da_members_.size ())
     return 0;
 
-  ++this->current_index_;
+  ++this->index_;
   return 1;
 }
 
@@ -338,14 +338,14 @@ TAO_DynStruct_i::seek (CORBA::Long slot,
       || slot >= (CORBA::Long) this->da_members_.size ())
     return 0;
 
-  this->current_index_ = slot;
+  this->index_ = slot;
   return 1;
 }
 
 void
 TAO_DynStruct_i::rewind (CORBA::Environment &)
 {
-  this->current_index_ = 0;
+  this->index_ = 0;
 }
 
 // The insert-primitive and get-primitive functions are required
@@ -361,7 +361,7 @@ void
 TAO_DynStruct_i::insert_boolean (CORBA::Boolean value,
                                  CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_boolean)
     {
@@ -377,7 +377,7 @@ void
 TAO_DynStruct_i::insert_octet (CORBA::Octet value,
                                CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_octet)
     {
@@ -393,7 +393,7 @@ void
 TAO_DynStruct_i::insert_char (CORBA::Char value,
                               CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_char)
     {
@@ -409,7 +409,7 @@ void
 TAO_DynStruct_i::insert_short (CORBA::Short value,
                                CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_short)
     {
@@ -425,7 +425,7 @@ void
 TAO_DynStruct_i::insert_ushort (CORBA::UShort value,
                                 CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_ushort)
     {
@@ -441,7 +441,7 @@ void
 TAO_DynStruct_i::insert_long (CORBA::Long value,
                               CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_long)
     {
@@ -457,7 +457,7 @@ void
 TAO_DynStruct_i::insert_ulong (CORBA::ULong value,
                                CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_long)
     {
@@ -473,7 +473,7 @@ void
 TAO_DynStruct_i::insert_float (CORBA::Float value,
                                CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_float)
     {
@@ -489,7 +489,7 @@ void
 TAO_DynStruct_i::insert_double (CORBA::Double value,
                                 CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_double)
     {
@@ -505,7 +505,7 @@ void
 TAO_DynStruct_i::insert_string (const char * value,
                                 CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_string)
     {
@@ -521,7 +521,7 @@ void
 TAO_DynStruct_i::insert_reference (CORBA::Object_ptr value,
                                    CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_objref)
     {
@@ -537,7 +537,7 @@ void
 TAO_DynStruct_i::insert_typecode (CORBA::TypeCode_ptr value,
                                   CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_TypeCode)
     {
@@ -553,7 +553,7 @@ void
 TAO_DynStruct_i::insert_longlong (CORBA::LongLong value,
                                   CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_longlong)
     {
@@ -569,7 +569,7 @@ void
 TAO_DynStruct_i::insert_ulonglong (CORBA::ULongLong value,
                                    CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_ulonglong)
     {
@@ -585,7 +585,7 @@ void
 TAO_DynStruct_i::insert_wchar (CORBA::WChar value,
                                CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_wchar)
     {
@@ -601,7 +601,7 @@ void
 TAO_DynStruct_i::insert_any (const CORBA::Any& value,
                              CORBA::Environment &env)
 {
-  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->current_index_),
+  if (TAO_DynAny_i::unalias (this->type_.in ()->member_type (this->index_),
                              env)
       == CORBA::tk_any)
     {
@@ -624,7 +624,7 @@ TAO_DynStruct_i::get_boolean (CORBA::Environment &env)
 {
   CORBA::Boolean val = 0;;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -649,7 +649,7 @@ TAO_DynStruct_i::get_octet (CORBA::Environment &env)
 {
   CORBA::Octet val = 0;
   CORBA_DynAny_ptr dp = 
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -674,7 +674,7 @@ TAO_DynStruct_i::get_char (CORBA::Environment &env)
 {
   CORBA::Char val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -699,7 +699,7 @@ TAO_DynStruct_i::get_short (CORBA::Environment &env)
 {
   CORBA::Short val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -724,7 +724,7 @@ TAO_DynStruct_i::get_ushort (CORBA::Environment &env)
 {
   CORBA::UShort val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -749,7 +749,7 @@ TAO_DynStruct_i::get_long (CORBA::Environment &env)
 {
   CORBA::Long val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -774,7 +774,7 @@ TAO_DynStruct_i::get_ulong (CORBA::Environment &env)
 {
   CORBA::ULong val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -799,7 +799,7 @@ TAO_DynStruct_i::get_float (CORBA::Environment &env)
 {
   CORBA::Float val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -824,7 +824,7 @@ TAO_DynStruct_i::get_double (CORBA::Environment &env)
 {
   CORBA::Double val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -849,7 +849,7 @@ TAO_DynStruct_i::get_string (CORBA::Environment &env)
 {
   CORBA::Char *val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -874,7 +874,7 @@ TAO_DynStruct_i::get_reference (CORBA::Environment &env)
 {
   CORBA_Object_ptr val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -899,7 +899,7 @@ TAO_DynStruct_i::get_typecode (CORBA::Environment &env)
 {
   CORBA_TypeCode_ptr val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -927,7 +927,7 @@ TAO_DynStruct_i::get_longlong (CORBA::Environment &env)
 #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 ();
+  CORBA_DynAny_ptr dp = this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -952,7 +952,7 @@ TAO_DynStruct_i::get_ulonglong (CORBA::Environment &env)
 {
   CORBA::ULongLong val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -977,7 +977,7 @@ TAO_DynStruct_i::get_wchar (CORBA::Environment &env)
 {
   CORBA::WChar val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
@@ -1002,7 +1002,7 @@ TAO_DynStruct_i::get_any (CORBA::Environment &env)
 {
   CORBA_Any_ptr val = 0;
   CORBA_DynAny_ptr dp =
-    this->da_members_[this->current_index_].in ();
+    this->da_members_[this->index_].in ();
 
   if (dp)
     {
diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h
index aea79e0a4c8..152abe31ba2 100644
--- a/TAO/tao/DynStruct_i.h
+++ b/TAO/tao/DynStruct_i.h
@@ -149,7 +149,7 @@ private:
   CORBA::TypeCode_var type_;
   // Holds the typecode of the Struct
 
-  CORBA::Long current_index_;
+  CORBA::Long index_;
   // Index of the current component
 
   ACE_Array_Base<CORBA_DynAny_var> da_members_;
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index 4b99903ef12..571aae717e0 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -76,7 +76,7 @@ TAO_DynUnion_i::~TAO_DynUnion_i (void)
 CORBA::Boolean
 TAO_DynUnion_i::set_as_default (CORBA::Environment& env)
 {
-  if ((CORBA::Long) this->current_index_ == this->type_->default_index (env))
+  if ((CORBA::Long) this->index_ == this->type_->default_index (env))
     return 1;
   else
     return 0;
@@ -114,7 +114,7 @@ TAO_DynUnion_i::member (CORBA::Environment &)
 char*
 TAO_DynUnion_i::member_name (CORBA::Environment& env)
 {
-  return CORBA::string_dup (this->type_->member_name (this->current_index_,
+  return CORBA::string_dup (this->type_->member_name (this->index_,
                                                       env));
 }
 
@@ -138,7 +138,7 @@ TAO_DynUnion_i::member_name (const char* member_name,
         {
           // No sense doing anything if we're just "resetting" to the
           // current member.
-          if (i == this->current_index_)
+          if (i == this->index_)
             return;
           else
             {
@@ -150,7 +150,7 @@ TAO_DynUnion_i::member_name (const char* member_name,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -160,7 +160,7 @@ TAO_DynUnion_i::member_name (const char* member_name,
 CORBA::TCKind
 TAO_DynUnion_i::member_kind (CORBA::Environment& env)
 {
-  return TAO_DynAny_i::unalias (this->type_->member_type (this->current_index_,
+  return TAO_DynAny_i::unalias (this->type_->member_type (this->index_,
                                                           env),
                                 env);
 }
@@ -286,16 +286,16 @@ TAO_DynUnion_i::current_component (CORBA::Environment &)
 CORBA::Boolean
 TAO_DynUnion_i::next (CORBA::Environment &env)
 {
-  if (this->current_index_ + 1 == this->type_->member_count (env))
+  if (this->index_ + 1 == this->type_->member_count (env))
     return 0;
 
-  ++this->current_index_;
+  ++this->index_;
 
   if (!CORBA::is_nil (this->member_.in ()))
     this->member_->destroy (env);
 
   this->member_ =
-    TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->current_index_,
+    TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->index_,
                                                             env),
                                   env);
   return 1;
@@ -309,13 +309,13 @@ TAO_DynUnion_i::seek (CORBA::Long slot,
       || slot >= (CORBA::Long) this->type_->member_count (env))
     return 0;
 
-  this->current_index_ = slot;
+  this->index_ = slot;
 
   if (!CORBA::is_nil (this->member_.in ()))
     this->member_->destroy (env);
 
   this->member_ =
-    TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->current_index_,
+    TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->index_,
                                                             env),
                                   env);
   return 1;
@@ -324,16 +324,16 @@ TAO_DynUnion_i::seek (CORBA::Long slot,
 void
 TAO_DynUnion_i::rewind (CORBA::Environment &env)
 {
-  if (this->current_index_ == 0)
+  if (this->index_ == 0)
     return;
 
-  this->current_index_ = 0;
+  this->index_ = 0;
 
   if (!CORBA::is_nil (this->member_.in ()))
     this->member_->destroy (env);
 
   this->member_ =
-    TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->current_index_,
+    TAO_DynAny_i::create_dyn_any (this->type_->member_type (this->index_,
                                                             env),
                                   env);
 }
@@ -381,7 +381,7 @@ TAO_DynUnion_i::insert_boolean (CORBA::Boolean value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -425,7 +425,7 @@ TAO_DynUnion_i::insert_octet (CORBA::Octet value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -469,7 +469,7 @@ TAO_DynUnion_i::insert_char (CORBA::Char value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -511,7 +511,7 @@ TAO_DynUnion_i::insert_short (CORBA::Short value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -555,7 +555,7 @@ TAO_DynUnion_i::insert_long (CORBA::Long value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -598,7 +598,7 @@ TAO_DynUnion_i::insert_ushort (CORBA::UShort value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -642,7 +642,7 @@ TAO_DynUnion_i::insert_ulong (CORBA::ULong value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -686,7 +686,7 @@ TAO_DynUnion_i::insert_float (CORBA::Float value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -730,7 +730,7 @@ TAO_DynUnion_i::insert_double (CORBA::Double value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -773,7 +773,7 @@ TAO_DynUnion_i::insert_string (const char* value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -817,7 +817,7 @@ TAO_DynUnion_i::insert_reference (CORBA::Object_ptr value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -861,7 +861,7 @@ TAO_DynUnion_i::insert_typecode (CORBA::TypeCode_ptr value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -904,7 +904,7 @@ TAO_DynUnion_i::insert_longlong (CORBA::LongLong value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -947,7 +947,7 @@ TAO_DynUnion_i::insert_ulonglong (CORBA::ULongLong value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -991,7 +991,7 @@ TAO_DynUnion_i::insert_wchar (CORBA::WChar value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -1033,7 +1033,7 @@ TAO_DynUnion_i::insert_any (const CORBA::Any& value,
                 TAO_DynAny_i::create_dyn_any (*this->type_->member_label (i,
                                                                           env),
                                               env);
-              this->current_index_ = i;
+              this->index_ = i;
               return;
             }
         }
@@ -1316,10 +1316,8 @@ DU_Extractor<CORBA::Char>::check_match (const CORBA_Any& inside_any,
 {
   CORBA::Any::to_char member_struct (this->member_index_);
   CORBA::Any::to_char arg_struct (this->arg_index_);
-
   inside_any >>= member_struct;
   outside_any >>= arg_struct;
-
   return member_struct.ref_ == arg_struct.ref_;
 }
 
@@ -1454,7 +1452,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
                       0,
                       cdr.start ());
 
-  if (!CORBA::is_nil (this->discriminator_.in ()))
+  if (!CORBA::is_nil (this->discriminator_.in()))
     this->discriminator_->destroy (env);
 
   // Set the discriminator holder.
@@ -1492,7 +1490,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
       else if (functor->check_match (disc_any,
                                      label_any))
         {
-          this->current_index_ = i;
+          this->index_ = i;
           break;
         }
     }
@@ -1504,9 +1502,9 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
   else
     {
       if (i == count && default_index != -1)
-        this->current_index_ = default_index;
+        this->index_ = default_index;
 
-      CORBA_Any member_any (any.type ()->member_type (this->current_index_,
+      CORBA_Any member_any (any.type ()->member_type (this->index_,
                                                       env),
                             0,
                             cdr.start ());
diff --git a/TAO/tao/DynUnion_i.h b/TAO/tao/DynUnion_i.h
index c6b5c230251..1937cd03613 100644
--- a/TAO/tao/DynUnion_i.h
+++ b/TAO/tao/DynUnion_i.h
@@ -161,7 +161,7 @@ private:
   CORBA::TypeCode_var type_;
   // Holds the typecode of the Union
 
-  CORBA::ULong current_index_;
+  CORBA::ULong index_;
   // Index of the active member
 
   TAO_DynUnion_i (void);
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 66f86728524..fbefa9c59f3 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -10,6 +10,19 @@
 
 ACE_RCSID(tao, Environment, "$Id$")
 
+void
+CORBA::release (CORBA::Environment_ptr env)
+{
+  if (env)
+    env->_decr_refcnt ();
+}
+
+CORBA::Boolean
+CORBA::is_nil (CORBA::Environment_ptr env)
+{
+  return env == 0;
+}
+
 #if 0
 CORBA_Environment::CORBA_Environment (void)
   : exception_ (0),
@@ -37,16 +50,14 @@ CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core)
 
 CORBA_Environment::CORBA_Environment (void)
   : exception_ (0),
-    previous_ (0),
-    refcount_ (1)
+    previous_ (0)
 {
   //  TAO_ORB_Core_instance ()->default_environment (this);
 }
 
 CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs)
   : exception_ (rhs.exception_),
-    previous_ (0),
-    refcount_ (1)
+    previous_ (0)
 {
   //  TAO_ORB_Core_instance ()->default_environment (this);
   if (this->exception_)
@@ -164,7 +175,7 @@ CORBA::Environment::exception_type (void) const
   //    platforms?!
   // @@ Doug: Yes, they are used to compare against the _id() of the
   //    exception, which should have been mappend to the native
-  //    codeset.  Notice the "should" we haven't tried that stuff yet,
+  //    codeset.  Notice the "should" we haven't tried that stuff yet, 
   //    and i find it hard to keep track of all the transformations
   //    going on, specially for the TypeCodes that are generated by
   //    the IDL compiler vs. the ones hard-coded in
@@ -225,7 +236,7 @@ CORBA::Environment::print_exception (const char *info,
         CORBA_SystemException::_narrow (this->exception_);
 
       if (x2 != 0)
-        x2->_tao_print_system_exception ();
+        x2->print_exception_tao_ ();
       else
         // @@ we can use the exception's typecode to dump all the data
         // held within it ...
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index 86516d652c3..86eb048700e 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -136,12 +136,12 @@ class TAO_Export CORBA_Environment_var
   //   Provide for automatic storage deallocation on going out of
   //   scope.
 public:
-  CORBA_Environment_var (void);
+  CORBA_Environment_var (void); 
   // default constructor
   CORBA_Environment_var (CORBA_Environment_ptr);
-  CORBA_Environment_var (const CORBA_Environment_var &);
+  CORBA_Environment_var (const CORBA_Environment_var &); 
   // copy constructor
-  ~CORBA_Environment_var (void);
+  ~CORBA_Environment_var (void); 
   // destructor
 
   CORBA_Environment_var &operator= (CORBA_Environment_ptr);
diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
index e57f23f3514..3dd045f35f8 100644
--- a/TAO/tao/Environment.i
+++ b/TAO/tao/Environment.i
@@ -1,19 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Environment_ptr env)
-{
-  return env == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::Environment_ptr env)
-{
-  if (env)
-    env->_decr_refcnt ();
-}
-
 ACE_INLINE CORBA_Exception*
 CORBA_Environment::exception (void) const
 {
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 043a4356b08..105dafa4240 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -9,10 +9,6 @@
 #include "tao/Any.h"
 #include "tao/CDR.h"
 
-#if defined(ACE_MVS)
-#include "ace/Codeset_IBM1047.h"
-#endif /* ACE_MVS */
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Exception.i"
 #endif /* __ACE_INLINE__ */
@@ -81,7 +77,7 @@ CORBA_Exception::_id (void) const
     return 0;
 }
 
-CORBA::TypeCode_ptr
+TAO_CONST CORBA::TypeCode_ptr
 CORBA_Exception::_type (void) const
 {
   return this->type_;
@@ -95,8 +91,8 @@ CORBA_Exception::_is_a (const char* repository_id) const
 }
 
 void
-CORBA_Exception::_tao_print_exception (const char *info,
-                                       FILE *) const
+CORBA_Exception::print_exception (const char *info,
+                                  FILE *) const
 {
   const char *id = this->_id ();
 
@@ -109,7 +105,7 @@ CORBA_Exception::_tao_print_exception (const char *info,
                                                     this));
 
   if (x2 != 0)
-    x2->_tao_print_system_exception ();
+    x2->print_exception_tao_ ();
   else
     // @@ we can use the exception's typecode to dump all the data
     // held within it ...
@@ -164,12 +160,6 @@ CORBA_UserException::operator= (const CORBA_UserException &src)
   return *this;
 }
 
-void
-CORBA_UserException::_raise (void)
-{
-  TAO_RAISE (*this);
-}
-
 int
 CORBA_UserException::_is_a (const char* interface_id) const
 {
@@ -242,7 +232,7 @@ CORBA_SystemException::_raise (void)
 }
 
 CORBA::ULong
-CORBA_SystemException::_tao_errno (int errno_value)
+CORBA_SystemException::errno_tao_ (int errno_value)
 {
   switch (errno_value)
     {
@@ -258,33 +248,23 @@ CORBA_SystemException::_tao_errno (int errno_value)
       return TAO_EPIPE_MINOR_CODE;
     case ECONNREFUSED:
       return TAO_ECONNREFUSED_MINOR_CODE;
-    case ENOENT:
-      return TAO_ENOENT_MINOR_CODE;
-    case EBADF:
-      return TAO_EBADF_MINOR_CODE;
-    case ENOSYS:
-      return TAO_ENOSYS_MINOR_CODE;
-    case EPERM:
-      return TAO_EPERM_MINOR_CODE;
-    case EAFNOSUPPORT:
-      return TAO_EAFNOSUPPORT_MINOR_CODE;
     default:
       return TAO_UNKNOWN_MINOR_CODE;
     }
 }
 
 CORBA::ULong
-CORBA_SystemException::_tao_minor_code (u_int location,
+CORBA_SystemException::minor_code_tao_ (u_int location,
                                         int errno_value)
 {
   return
     TAO_DEFAULT_MINOR_CODE
     | location
-    | _tao_errno (errno_value);
+    | errno_tao_ (errno_value);
 }
 
 void
-CORBA_SystemException::_tao_print_system_exception (FILE *) const
+CORBA_SystemException::print_exception_tao_ (FILE *) const
 {
   // @@ there are a other few "user exceptions" in the CORBA scope,
   // they're not all standard/system exceptions ... really need to
@@ -304,68 +284,53 @@ CORBA_SystemException::_tao_print_system_exception (FILE *) const
       const char *location;
       switch (this->minor () & 0x00000FF0u)
         {
-        case TAO_INVOCATION_CONNECT_MINOR_CODE:
+        case TAO_INVOCATION_CONNECT_MINOR_CODE :
           location = "invocation connect failed";
           break;
-        case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE:
+        case TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE :
           location = "location forward failed";
           break;
-        case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE:
+        case TAO_INVOCATION_SEND_REQUEST_MINOR_CODE :
           location = "send request failed";
           break;
-        case TAO_POA_DISCARDING:
+        case TAO_POA_DISCARDING :
           location = "poa in discarding state";
           break;
-        case TAO_POA_HOLDING:
+        case TAO_POA_HOLDING :
           location = "poa in holding state";
           break;
-        case TAO_UNHANDLED_SERVER_CXX_EXCEPTION:
+        case TAO_UNHANDLED_SERVER_CXX_EXCEPTION :
           location = "unhandled c++ exception in server side";
           break;
-        case TAO_INVOCATION_RECV_REQUEST_MINOR_CODE:
+        case TAO_INVOCATION_RECV_REQUEST_MINOR_CODE :
           location = "failed to recv request response";
           break;
-        default:
+        default :
           location = "unknown location";
         }
 
       const char *errno_indication;
       switch (this->minor () & 0x0000000Fu)
         {
-        case TAO_UNSPECIFIED_MINOR_CODE:
+        case TAO_UNSPECIFIED_MINOR_CODE :
           errno_indication = "unspecified errno";
           break;
-        case TAO_ETIMEDOUT_MINOR_CODE:
+        case TAO_ETIMEDOUT_MINOR_CODE :
           errno_indication = "ETIMEOUT";
           break;
-        case TAO_ENFILE_MINOR_CODE:
+        case TAO_ENFILE_MINOR_CODE :
           errno_indication = "ENFILE";
           break;
-        case TAO_EMFILE_MINOR_CODE:
+        case TAO_EMFILE_MINOR_CODE :
           errno_indication = "EMFILE";
           break;
-        case TAO_EPIPE_MINOR_CODE:
+        case TAO_EPIPE_MINOR_CODE :
           errno_indication = "EPIPE";
           break;
-        case TAO_ECONNREFUSED_MINOR_CODE:
+        case TAO_ECONNREFUSED_MINOR_CODE :
           errno_indication = "ECONNREFUSED";
           break;
-        case TAO_ENOENT_MINOR_CODE:
-          errno_indication = "ENOENT";
-          break;
-        case TAO_EBADF_MINOR_CODE:
-          errno_indication = "EBADF";
-          break;
-        case TAO_ENOSYS_MINOR_CODE:
-          errno_indication = "ENOSYS";
-          break;
-        case TAO_EPERM_MINOR_CODE:
-          errno_indication = "EPERM";
-          break;
-        case TAO_EAFNOSUPPORT_MINOR_CODE:
-          errno_indication = "EAFNOSUPPORT";
-          break;
-        default:
+        default :
           errno_indication = "unknown errno";
         }
 
@@ -400,10 +365,9 @@ CORBA_UnknownUserException::CORBA_UnknownUserException (void)
 
 CORBA_UnknownUserException::CORBA_UnknownUserException (CORBA_Any &ex)
 {
+  // @@ Nanbor, shouldn't we be checking for "new" failure here with
+  // ACE_NEW?
   this->exception_ = new CORBA_Any (ex);
-  if (this->exception_ == 0)
-    ACE_ERROR ((LM_ERROR,
-                "(%P|%t) Unable to copy CORBA::UnknownUerException due to memory exhaustion\n"));
 }
 
 CORBA_UnknownUserException::~CORBA_UnknownUserException (void)
@@ -446,7 +410,7 @@ CORBA_UnknownUserException::_raise (void)
 
 void
 TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::Environment &TAO_IN_ENV)
 {
   // Create the TypeCode for the CORBA_UnknownUserException.
 
@@ -455,7 +419,7 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
   // are stored in ISO8859 form, the problem is that this hack does
   // not scale as more native sets have to be supported
 
-  ACE_IBM1047_ISO8859 translator;
+  ACE_Codeset_IBM1047_ISO8859 translator;
   TAO_OutputCDR stream (0,
                         ACE_CDR_BYTE_ORDER,
                         TAO_Exceptions::global_allocator_,
@@ -482,17 +446,15 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
       || 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 ());
+                        TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
+    TAO_THROW (CORBA_INITIALIZE ());
 
-  ACE_NEW_THROW_EX (tcp,
-                    CORBA::TypeCode (CORBA::tk_except,
-                                     stream.length (),
-                                     stream.buffer (),
-                                     1,
-                                     sizeof (CORBA_UserException)),
-                    CORBA_NO_MEMORY ());
+  // @@ Nanbor, shouldn't we be checking for "new" failure here?
+  tcp = new CORBA::TypeCode (CORBA::tk_except,
+                             stream.length (),
+                             stream.buffer (),
+                             1,
+                             sizeof (CORBA_UserException));
 }
 
 void
@@ -516,7 +478,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
   // are stored in ISO8859 form, the problem is that this hack does
   // not scale as more native sets have to be supported
 
-  ACE_IBM1047_ISO8859 translator;
+  ACE_Codeset_IBM1047_ISO8859 translator;
   TAO_OutputCDR stream (buffer, buflen,
                         ACE_CDR_BYTE_ORDER,
                         TAO_Exceptions::global_allocator_,
@@ -557,12 +519,10 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
       || 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_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
     ACE_THROW (CORBA::INITIALIZE ());
   // @@ It is possible to throw an exception at this point?  What if
   // the exception typecode has not been initialized yet?
@@ -574,13 +534,12 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
   // a TypeCode, saving it away in the list of ones that the ORB will
   // always accept as part of any operation response!
 
-  ACE_NEW_THROW_EX (tcp,
-                    CORBA::TypeCode (CORBA::tk_except,
-                                     stream.length (),
-                                     stream.buffer (),
-                                     1,
-                                     sizeof (CORBA_SystemException)),
-                    CORBA_NO_MEMORY ());
+  // @@ Nanbor, shouldn't we check for "new" failure here?
+  tcp = new CORBA::TypeCode (CORBA::tk_except,
+                             stream.length (),
+                             stream.buffer (),
+                             1,
+                             sizeof (CORBA_SystemException));
 
   TAO_Exceptions::system_exceptions->add (tcp);
 
@@ -720,21 +679,21 @@ STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
 #define TAO_SYSTEM_EXCEPTION(name) \
-CORBA_##name * \
-CORBA_##name ::_narrow (CORBA_Exception* exception) \
+void \
+CORBA_##name ::_raise (void) \
 { \
-  if (exception->_is_a ("IDL:omg.org/CORBA/" #name ":1.0")) \
-    return ACE_dynamic_cast (CORBA_##name *, exception); \
-  return 0; \
+  TAO_RAISE(*this); \
 }
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
 #define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA_##name ::_raise (void) \
+CORBA_##name * \
+CORBA_##name ::_narrow (CORBA_Exception* exception) \
 { \
-  TAO_RAISE (*this); \
+  if (exception->_is_a ("IDL:omg.org/CORBA/" #name ":1.0")) \
+    return ACE_dynamic_cast (CORBA_##name *, exception); \
+  return 0; \
 }
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
@@ -790,15 +749,16 @@ CORBA_ExceptionList::add_consume (CORBA::TypeCode_ptr tc)
 
 CORBA::TypeCode_ptr
 CORBA_ExceptionList::item (CORBA::ULong slot,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_IN_ENV)
 {
   CORBA::TypeCode_ptr *tc;
 
-  //  ACE_TRY_ENV.clear ();
+  TAO_IN_ENV.clear ();
 
   if (this->tc_list_.get (tc,
                           slot) == -1)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+    TAO_THROW_RETURN (CORBA::TypeCode::Bounds (),
+                      0);
   else
     return CORBA::TypeCode::_duplicate (*tc);
 }
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 0cac40dc027..213ce34a3ca 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -46,28 +46,31 @@ public:
   virtual ~CORBA_Exception (void);
   // Destructor.
 
-  // = To throw the exception (when using the standard mapping).
-  virtual void _raise (void) = 0;
-
-  // = The static narrow operation.
-  static CORBA_Exception *_narrow (CORBA_Exception *x);
-
   // = These are TAO-specific extensions.
 
+  // @@ Nanbor, can you please rearrange these methods so that all the
+  // TAO-specific stuff comes in one place, e.g., at the end of the
+  // public part?
+  CORBA_Exception (CORBA::TypeCode_ptr type);
+  // Constructor from a TypeCode.
+
   const char *_id (void) const;
   // Return the repository ID of the Exception.
 
-  CORBA::TypeCode_ptr _type (void) const;
+  TAO_CONST CORBA::TypeCode_ptr _type (void) const;
   // Return the TypeCode corresponding to the currently stored.
 
   // = To implement the narrow method.
   virtual int _is_a (const char* repository_id) const;
 
-  CORBA_Exception (CORBA::TypeCode_ptr type);
-  // Constructor from a TypeCode.
+  // = To throw the exception (when using the standard mapping).
+  virtual void _raise (void) = 0;
 
-  void _tao_print_exception (const char *info,
-                             FILE *f = stdout) const;
+  // = TAO extension.  It makes it easier to write generic code.
+  static CORBA_Exception *_narrow (CORBA_Exception *x);
+
+  void print_exception (const char *info,
+                        FILE *f = stdout) const;
   // Print the exception <ex> to output determined by <f>.  This
   // function is not CORBA compliant.
 
@@ -99,26 +102,27 @@ class TAO_Export CORBA_UserException : public CORBA_Exception
   //   User exceptions are those defined by application developers
   //   using OMG-IDL.
 public:
+  // @@ Nanbor, can you please rearrange these methods so that all the
+  // TAO-specific stuff comes in one place, e.g., at the end of the
+  // public part?
+
   // = Initialization and termination methods.
   CORBA_UserException (const CORBA_UserException &src);
   // Copy ctor.
 
+  CORBA_UserException (CORBA::TypeCode_ptr tc);
+  // Constructor from a TypeCode.
+
   ~CORBA_UserException (void);
   // Destructor.
 
   CORBA_UserException &operator= (const CORBA_UserException &src);
   // Assignment operator.
 
-  virtual void _raise (void);
-  // To throw an exception of this type.
-
   static CORBA_UserException *_narrow (CORBA_Exception *exception);
   // The narrow operation.
 
-  // = TAO specific extension.
-
-  CORBA_UserException (CORBA::TypeCode_ptr tc);
-  // Constructor from a TypeCode.
+  // = extension
 
   virtual int _is_a (const char *interface_id) const;
   // Used for narrowing
@@ -139,6 +143,10 @@ class TAO_Export CORBA_SystemException : public CORBA_Exception
 public:
   // = Initialization and termination methods.
 
+  // @@ Nanbor, can you please rearrange these methods so that all the
+  // TAO-specific stuff comes in one place, e.g., at the end of the
+  // public part?
+
   CORBA_SystemException (const CORBA_SystemException &src);
   // Copy ctor.
 
@@ -154,9 +162,6 @@ public:
   void minor (CORBA::ULong m);
   // Set the minor status.
 
-  virtual void _raise (void);
-  // To throw an exception of this type.
-
   CORBA::CompletionStatus completed (void) const;
   // Get the completion status.
 
@@ -171,15 +176,18 @@ public:
   virtual int _is_a (const char *type_id) const;
   // Helper for the _narrow operation.
 
-  void _tao_print_system_exception (FILE *f = stdout) const;
+  virtual void _raise (void);
+  // @@ Nanbor, please document!
+
+  void print_exception_tao_ (FILE *f = stdout) const;
   // Print the system exception <ex> to output determined by f.  This
   // function is not CORBA compliant.
 
-  static CORBA::ULong _tao_minor_code (u_int location,
+  static CORBA::ULong minor_code_tao_ (u_int location,
                                        int errno_value);
   // Helper to create a minor status value.
 
-  static CORBA::ULong _tao_errno (int errno_value);
+  static CORBA::ULong errno_tao_ (int errno_value);
   // Helper to translate a platform-specific errno to a TAO errno
   // value.
 
@@ -210,9 +218,9 @@ public: \
                   CORBA::CompletionStatus completed) \
     : CORBA_SystemException (CORBA::_tc_ ## name, code, completed) \
     { } \
+  virtual void _raise (void); \
   static CORBA_##name * _narrow (CORBA_Exception* exception); \
   virtual int _is_a (const char* type_id) const; \
-  virtual void _raise (void); \
 }
 
 TAO_SYSTEM_EXCEPTION(UNKNOWN);
@@ -277,20 +285,14 @@ public:
   CORBA_Any& exception (void);
   // Return the any containing the user exception.
 
-  virtual void _raise (void);
-  // To throw an UnknownUserException of this type.
-
+  // @@ Nanbor, please document these methods.
   static CORBA_UnknownUserException *_narrow (CORBA_Exception *ex);
-  // Narrow to an UnknowUserException
-
-  // = TAO specific extension.
-
   virtual int _is_a (const char *type_id) const;
-  // Helper method to implement _narrow.
+  virtual void _raise (void);
 
 private:
   CORBA_Any *exception_;
-  // Holder for the actual exception.
+  // @@ Nanbor, please document this.
 };
 
 class TAO_Export TAO_Exceptions
@@ -368,8 +370,8 @@ public:
   CORBA::ULong count ();
   // Return the number of elements.
 
+  // @@ Nanbor, can you please document these?
   CORBA_ExceptionList_ptr _duplicate (void);
-  // Increase the reference count.
 
   void _destroy (void);
 
@@ -412,10 +414,7 @@ private:
 class TAO_Export CORBA_ExceptionList_var
 {
   // = TITLE
-  //   CORBA_ExceptionList_var
-  //
-  // = DESCRIPTION
-  //   Lifecycle management helper class for ExceptionList objects.
+  //  @@ Nanbor, please document.
 public:
   CORBA_ExceptionList_var (void);
   // default constructor
diff --git a/TAO/tao/Forwarding_Servant.cpp b/TAO/tao/Forwarding_Servant.cpp
index eca4db6c77e..8115e5b3b46 100644
--- a/TAO/tao/Forwarding_Servant.cpp
+++ b/TAO/tao/Forwarding_Servant.cpp
@@ -20,21 +20,21 @@ TAO_Forwarding_Servant::TAO_Forwarding_Servant (CORBA::Object_ptr forward_to,
 
 void
 TAO_Forwarding_Servant::invoke (CORBA::ServerRequest_ptr request,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (request);
 
-  CORBA::Exception *exception = 0;
-  ACE_NEW_THROW_EX (exception,
-                    PortableServer::ForwardRequest (this->forward_to_.in ()),
-                    CORBA::NO_MEMORY ());
+  // Throw forward exception @@ Irfan, shouldn't we check for "new"
+  // failure here via ACE_NEW?
+  CORBA::Exception *exception
+    = new PortableServer::ForwardRequest (this->forward_to_.in ());
 
   CORBA::Any any (exception->_type (),
                   exception,
                   1);
 
   request->set_exception (any,
-                          ACE_TRY_ENV);
+                          env);
 }
 
 CORBA::RepositoryId
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index d22d0fff8f9..0b1d42f1a83 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -99,111 +99,6 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_GIOP_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
-TAO_GIOP_Message_State::TAO_GIOP_Message_State (TAO_ORB_Core* orb_core)
-  : byte_order (TAO_ENCAP_BYTE_ORDER),
-    more_fragments (0),
-    message_type (TAO_GIOP::MessageError),
-    message_size (0),
-    current_offset (0),
-    cdr (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
-         TAO_ENCAP_BYTE_ORDER,
-         orb_core),
-    fragments_begin (0),
-    fragments_end (0)
-{
-  // Note that we need to use the ASCII values so the code will be
-  // portable to platforms that use different character sets, such as
-  // MVS (which uses EBCDIC).
-  this->magic[0] = 0x47;   // 'G'
-  this->magic[1] = 0x49;   // 'I'
-  this->magic[2] = 0x4f;   // 'O'
-  this->magic[3] = 0x50;   // 'P'
-
-  giop_version.major = TAO_DEF_GIOP_MAJOR;
-  giop_version.minor = TAO_DEF_GIOP_MINOR;
-}
-
-int
-TAO_GIOP_Message_State::is_complete ()
-{
-  if (this->message_size != this->current_offset)
-    return 0;
-
-  if (this->more_fragments)
-    {
-      // This is only one fragment of the complete Request....
-      ACE_Message_Block* current =
-        this->cdr.steal_contents ();
-      if (this->fragments_begin == 0)
-        {
-          this->first_fragment_byte_order = this->byte_order;
-          this->first_fragment_giop_version = this->giop_version;
-          this->first_fragment_message_type = this->message_type;
-          this->fragments_end = this->fragments_begin = current;
-          this->reset ();
-          return 0;
-        }
-
-      return this->append_fragment (current);
-    }
-
-  if (this->fragments_begin != 0)
-    {
-      // This is the last message, but we must defragment before
-      // sending
-
-      ACE_Message_Block* current =
-        this->cdr.steal_contents ();
-      if (this->append_fragment (current) == -1)
-        return -1;
-
-      // Copy the entire chain into the input CDR.....
-      this->cdr.reset (this->fragments_begin,
-                       this->first_fragment_byte_order);
-      ACE_Message_Block::release (this->fragments_begin);
-      this->fragments_begin = 0;
-      this->fragments_end = 0;
-
-      this->byte_order = this->first_fragment_byte_order;
-      this->giop_version = this->first_fragment_giop_version;
-      this->message_type = this->first_fragment_message_type;
-
-      /*FALLTHROUGH*/
-    }
-  // else
-  // {
-  // This message has no more fragments, and there where no fragments
-  // before it, just return... notice that this->cdr has the right
-  // contents.
-  // }
-
-  return 1;
-}
-
-int
-TAO_GIOP_Message_State::append_fragment (ACE_Message_Block* current)
-{
-  this->fragments_end->cont (current);
-  this->fragments_end = this->fragments_end->cont ();
-
-  if (this->first_fragment_byte_order != this->byte_order
-      || this->first_fragment_giop_version.major != this->giop_version.major
-      || this->first_fragment_giop_version.minor != this->giop_version.minor)
-    {
-      // Yes, print it out in all debug levels!
-      ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) incompatible fragments:\n"
-                  "   Different GIOP versions or byte order\n"));
-      this->reset ();
-      return -1;
-    }
-  this->reset ();
-  return 0;
-}
-
-
-// ****************************************************************
-
 static const char digits [] = "0123456789ABCD";
 static const char *names [] =
 {
@@ -217,25 +112,47 @@ static const char *names [] =
   "Fragment"
 };
 
+TAO_GIOP_MessageHeader::TAO_GIOP_MessageHeader (void)
+  : byte_order (TAO_ENCAP_BYTE_ORDER),
+    message_type (TAO_GIOP::MessageError),
+    message_size (0)
+{
+  // Note that we need to use the ASCII values so the code will be
+  // portable to platforms that use different character sets, such as
+  // MVS (which uses EBCDIC).
+  this->magic[0] = 0x47;   // 'G'
+  this->magic[1] = 0x49;   // 'I'
+  this->magic[2] = 0x4f;   // 'O'
+  this->magic[3] = 0x50;   // 'P'
+
+  giop_version.major =
+    TAO_GIOP_MessageHeader::MY_MAJOR;
+  giop_version.minor =
+    TAO_GIOP_MessageHeader::MY_MINOR;
+}
+
 void
 TAO_GIOP::dump_msg (const char *label,
                     const u_char *ptr,
                     size_t len)
 {
+  const int TAO_GIOP_VERSION_MAJOR_OFFSET = 4;
+  const int TAO_GIOP_VERSION_MINOR_OFFSET = 5;
+  const int TAO_GIOP_MESSAGE_TYPE_OFFSET = 7;
+
   if (TAO_debug_level >= 5)
     {
       const char *message_name = "UNKNOWN MESSAGE";
       u_long slot = ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET];
       if (slot < sizeof (names)/sizeof(names[0]))
         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",
                   label,
                   digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]],
                   digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]],
                   len - TAO_GIOP_HEADER_LEN,
-                  (byte_order == TAO_ENCAP_BYTE_ORDER) ? "my" : "other",
+                  (ptr[6] == TAO_ENCAP_BYTE_ORDER) ? "my" : "other",
                   message_name));
 
       if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP::Request)
@@ -328,19 +245,21 @@ operator>> (TAO_InputCDR &cdr,
 }
 
 CORBA::Boolean
-TAO_GIOP::start_message (const TAO_GIOP_Version &version,
-                         TAO_GIOP::Message_Type type,
+TAO_GIOP::start_message (TAO_GIOP::Message_Type type,
                          TAO_OutputCDR &msg,
                          TAO_ORB_Core* orb_core)
 {
   if (orb_core->orb_params ()->use_lite_protocol ())
-    return TAO_GIOP::start_message_lite (version, type, msg);
+    return TAO_GIOP::start_message_lite (type,
+                                         msg);
   else
-    return TAO_GIOP::start_message_std (version, type, msg);
+    return TAO_GIOP::start_message_std (type,
+                                        msg);
 }
 
 CORBA::Boolean
-TAO_GIOP::write_request_header (CORBA::ULong request_id,
+TAO_GIOP::write_request_header (const TAO_GIOP_ServiceContextList& svc_ctx,
+                                CORBA::ULong request_id,
                                 CORBA::Boolean is_roundtrip,
                                 const TAO_opaque& key,
                                 const char *opname,
@@ -349,7 +268,7 @@ TAO_GIOP::write_request_header (CORBA::ULong request_id,
                                 TAO_ORB_Core *orb_core)
 {
   if (orb_core->orb_params ()->use_lite_protocol ())
-    return TAO_GIOP::write_request_header_lite (orb_core->service_context (),
+    return TAO_GIOP::write_request_header_lite (svc_ctx,
                                                 request_id,
                                                 is_roundtrip,
                                                 key,
@@ -357,7 +276,7 @@ TAO_GIOP::write_request_header (CORBA::ULong request_id,
                                                 principal,
                                                 msg);
   else
-    return TAO_GIOP::write_request_header_std (orb_core->service_context (),
+    return TAO_GIOP::write_request_header_std (svc_ctx,
                                                request_id,
                                                is_roundtrip,
                                                key,
@@ -491,27 +410,26 @@ TAO_GIOP::send_message (TAO_Transport *transport,
 // orderly disconnect as provided by TCP.  This quality of service is
 // required to write robust distributed systems.)
 
+// static CORBA::Octet
+static const char close_message [TAO_GIOP_HEADER_LEN] =
+{
+  // The following works on non-ASCII platforms, such as MVS (which
+  // uses EBCDIC).
+  0x47, // 'G'
+  0x49, // 'I'
+  0x4f, // 'O'
+  0x50, // 'P'
+  TAO_GIOP_MessageHeader::MY_MAJOR,
+  TAO_GIOP_MessageHeader::MY_MINOR,
+  TAO_ENCAP_BYTE_ORDER,
+  TAO_GIOP::CloseConnection,
+  0, 0, 0, 0
+};
+
 void
-TAO_GIOP::close_connection (const TAO_GIOP_Version& version,
-                            TAO_Transport *transport,
+TAO_GIOP::close_connection (TAO_Transport *transport,
                             void *)
 {
-  // static CORBA::Octet
-  const char close_message [TAO_GIOP_HEADER_LEN] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    0x47, // 'G'
-    0x49, // 'I'
-    0x4f, // 'O'
-    0x50, // 'P'
-    version.major,
-    version.minor,
-    TAO_ENCAP_BYTE_ORDER,
-    TAO_GIOP::CloseConnection,
-    0, 0, 0, 0
-  };
-
   // It's important that we use a reliable shutdown after we send this
   // message, so we know it's received.
   //
@@ -551,28 +469,26 @@ TAO_GIOP::close_connection (const TAO_GIOP_Version& version,
 //
 // NOTE that IIOP will still benefit from TCP's orderly disconnect.
 
-void
-TAO_GIOP::send_error (const TAO_GIOP_Version &version,
-                      TAO_Transport *transport)
+static const char
+error_message [TAO_GIOP_HEADER_LEN] =
 {
-  const char
-    error_message [TAO_GIOP_HEADER_LEN] =
-  {
-    // The following works on non-ASCII platforms, such as MVS (which
-    // uses EBCDIC).
-    0x47, // 'G'
-    0x49, // 'I'
-    0x4f, // 'O'
-    0x50, // 'P'
-    version.major,
-    version.minor,
-    TAO_ENCAP_BYTE_ORDER,
-    TAO_GIOP::MessageError,
-    0, 0, 0, 0
-  };
+  // The following works on non-ASCII platforms, such as MVS (which
+  // uses EBCDIC).
+  0x47, // 'G'
+  0x49, // 'I'
+  0x4f, // 'O'
+  0x50, // 'P'
+  TAO_GIOP_MessageHeader::MY_MAJOR,
+  TAO_GIOP_MessageHeader::MY_MINOR,
+  TAO_ENCAP_BYTE_ORDER,
+  TAO_GIOP::MessageError,
+  0, 0, 0, 0
+};
 
-  // @@ Q: How does this works with GIOP lite?
-  //    A: It doesn't
+void
+TAO_GIOP::send_error (TAO_Transport *transport)
+{
+  // @@ How does this works with GIOP lite?
 
   TAO_GIOP::dump_msg ("send_error",
                       (const u_char *) error_message,
@@ -659,7 +575,7 @@ TAO_GIOP::convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type)
 int
 TAO_GIOP::read_header (TAO_Transport *transport,
                        TAO_ORB_Core *orb_core,
-                       TAO_GIOP_Message_State &state,
+                       TAO_GIOP_MessageHeader &header,
                        CORBA::ULong &header_size,
                        TAO_InputCDR &input)
 {
@@ -694,27 +610,28 @@ TAO_GIOP::read_header (TAO_Transport *transport,
 
   if (TAO_GIOP::parse_header (orb_core,
                               input,
-                              state) == -1)
-    {
-      TAO_GIOP::send_error (state.giop_version, transport);
-      return -1;
-    }
-  return header_size;
+                              header) == -1)
+    return -1;
+  else
+    return header_size;
 }
 
 int
 TAO_GIOP::handle_input (TAO_Transport *transport,
                         TAO_ORB_Core *orb_core,
-                        TAO_GIOP_Message_State &state)
+                        TAO_GIOP_MessageHeader &header,
+                        CORBA::ULong &current_offset,
+                        TAO_InputCDR& input)
 {
-  if (state.header_received () == 0)
+  if (header.message_size == 0)
     {
+      current_offset = 0;
       CORBA::ULong header_size;
       if (TAO_GIOP::read_header (transport,
                                  orb_core,
-                                 state,
+                                 header,
                                  header_size,
-                                 state.cdr) == -1)
+                                 input) == -1)
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
@@ -723,8 +640,8 @@ TAO_GIOP::handle_input (TAO_Transport *transport,
           return -1;
         }
 
-      if (state.cdr.grow (header_size +
-                          state.message_size) == -1)
+      if (input.grow (header_size +
+                      header.message_size) == -1)
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
@@ -736,14 +653,14 @@ TAO_GIOP::handle_input (TAO_Transport *transport,
       // Growing the buffer may have reset the rd_ptr(), but we want
       // to leave it just after the GIOP header (that was parsed
       // already);
-      state.cdr.skip_bytes (header_size);
+      input.skip_bytes (header_size);
     }
 
   size_t missing_data =
-    state.message_size - state.current_offset;
+    header.message_size - current_offset;
   ssize_t n =
     TAO_GIOP::read_buffer (transport,
-                           state.cdr.rd_ptr () + state.current_offset,
+                           input.rd_ptr () + current_offset,
                            missing_data);
   if (n == -1)
     {
@@ -764,9 +681,9 @@ TAO_GIOP::handle_input (TAO_Transport *transport,
       return -1;
     }
 
-  state.current_offset += n;
+  current_offset += n;
 
-  if (state.current_offset == state.message_size)
+  if (current_offset == header.message_size)
     {
       if (TAO_debug_level >= 5)
         {
@@ -774,28 +691,29 @@ TAO_GIOP::handle_input (TAO_Transport *transport,
           if (orb_core->orb_params ()->use_lite_protocol ())
             header_len = TAO_GIOP_LITE_HEADER_LEN;
 
-          char *buf = state.cdr.rd_ptr ();
+          char *buf = input.rd_ptr ();
           buf -= header_len;
-          size_t msg_len = state.cdr.length () + header_len;
+          size_t msg_len = input.length () + header_len;
           TAO_GIOP::dump_msg ("recv",
                               ACE_reinterpret_cast (u_char *,
                                                     buf),
                               msg_len);
         }
+      return 1;
     }
-
-  return state.is_complete ();
+  return 0;
 }
 
 int
 TAO_GIOP::parse_reply (TAO_Transport *transport,
                        TAO_ORB_Core *orb_core,
-                       TAO_GIOP_Message_State &state,
+                       TAO_InputCDR &input,
+                       const TAO_GIOP_MessageHeader &header,
                        TAO_GIOP_ServiceContextList &reply_ctx,
                        CORBA::ULong &request_id,
                        CORBA::ULong &reply_status)
 {
-  switch (state.message_type)
+  switch (header.message_type)
     {
     case TAO_GIOP::Request:
       // In GIOP 1.0 and GIOP 1.1 this is an error, but it is
@@ -822,15 +740,11 @@ TAO_GIOP::parse_reply (TAO_Transport *transport,
     case TAO_GIOP::Reply:
       // Handle after the switch.
       break;
-
-    case TAO_GIOP::Fragment:
-      // Never happens:
-      break;
     }
 
   // For GIOP 1.0 and 1.1 the reply_ctx comes first:
   // @@ Use <header.giop_version> to make this work with GIOP 1.2
-  if ((state.cdr >> reply_ctx) == 0)
+  if ((input >> reply_ctx) == 0)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -840,7 +754,7 @@ TAO_GIOP::parse_reply (TAO_Transport *transport,
     }
 
   // Read the request id
-  if (!state.cdr.read_ulong (request_id))
+  if (!input.read_ulong (request_id))
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -852,7 +766,7 @@ TAO_GIOP::parse_reply (TAO_Transport *transport,
   // and the reply status type.  status can be NO_EXCEPTION,
   // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD or (on GIOP
   // 1.2) LOCATION_FORWARD_PERM
-  if (!state.cdr.read_ulong (reply_status))
+  if (!input.read_ulong (reply_status))
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
@@ -863,11 +777,13 @@ TAO_GIOP::parse_reply (TAO_Transport *transport,
   return 0;
 }
 
+// @@ Carlos, this method is rather large.  Is it possible to break it
+// up a bit?
 void
 TAO_GIOP::process_server_message (TAO_Transport *transport,
                                   TAO_ORB_Core *orb_core,
                                   TAO_InputCDR &input,
-                                  const TAO_GIOP_Message_State &state)
+                                  const TAO_GIOP_MessageHeader &header)
 {
   char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
 #if defined(ACE_HAS_PURIFY)
@@ -884,161 +800,66 @@ TAO_GIOP::process_server_message (TAO_Transport *transport,
                         orb_core->to_iso8859 (),
                         orb_core->to_unicode ());
 
-  TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END);
-
-  switch (state.message_type)
-    {
-    case TAO_GIOP::Request:
-      // The following two routines will either raise an exception
-      // or successfully write the response into <output>
-      TAO_GIOP::process_server_request (transport,
-                                        orb_core,
-                                        input,
-                                        output,
-                                        state.giop_version);
-      break;
-
-    case TAO_GIOP::LocateRequest:
-      TAO_GIOP::process_server_locate (transport,
-                                       orb_core,
-                                       input,
-                                       output,
-                                       state.giop_version);
-      break;
-
-    case TAO_GIOP::MessageError:
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) MessageError received by server\n"));
-      break;
+  CORBA::Boolean response_required = 0;
+  CORBA::ULong request_id = 0;
 
-      // These messages should never be sent to the server; it's an
-      // error if the peer tries.  Set the environment accordingly,
-      // as it's not yet been reported as an error.
-    case TAO_GIOP::Reply:
-    case TAO_GIOP::LocateReply:
-    case TAO_GIOP::CloseConnection:
-    default:   // Unknown message
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) Illegal message received by server\n"));
-      TAO_GIOP::send_error (state.giop_version, transport);
-      break;
-    }
-  TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END);
-}
-
-void
-TAO_GIOP::process_server_request (TAO_Transport *transport,
-                                  TAO_ORB_Core *orb_core,
-                                  TAO_InputCDR &input,
-                                  TAO_OutputCDR &output,
-                                  const TAO_GIOP_Version &version)
-{
-  CORBA::ULong request_id;
-  CORBA::ULong response_required = 0;
   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ();
   ACE_TRY
     {
-      // This will extract the request header, set <response_required>
-      // as appropriate.
-
-      int parse_error;
-      TAO_GIOP_ServerRequest request (input,
-                                      output,
-                                      orb_core,
-                                      version,
-                                      parse_error);
-
-      request_id = request.request_id ();
-      response_required = request.response_expected ();
-
-      if (parse_error != 0)
-        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 ();
+      TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END);
 
-      if (ACE_OS::memcmp (object_key,
-                          &TAO_POA::objectkey_prefix[0],
-                          TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
+      switch (header.message_type)
         {
-          ACE_CString object_id (ACE_reinterpret_cast (const char *,
-                                                       object_key),
-                                 request.object_key ().length (),
-                                 0,
-                                 0);
-
+        case TAO_GIOP::Request:
+          // The following two routines will either raise an exception
+          // or successfully write the response into <output>
+          TAO_GIOP::process_server_request (transport,
+                                            orb_core,
+                                            input,
+                                            output,
+                                            response_required,
+                                            request_id,
+                                            ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          break;
+
+        case TAO_GIOP::LocateRequest:
+          TAO_GIOP::process_server_locate (transport,
+                                           orb_core,
+                                           input,
+                                           output,
+                                           response_required,
+                                           request_id,
+                                           ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          break;
+
+          // These messages should never be sent to the server; it's an
+          // error if the peer tries.  Set the environment accordingly,
+          // as it's not yet been reported as an error.
+        case TAO_GIOP::Reply:
+        case TAO_GIOP::LocateReply:
+        case TAO_GIOP::CloseConnection:
+        default:   // Unknown message
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "Simple Object key %s. Doing the Table Lookup ...\n",
-                        object_id.c_str ()));
-
-          CORBA::Object_ptr object_reference =
-            CORBA::Object::_nil ();
-
-          // Do the Table Lookup.
-          int status =
-            orb_core->orb ()->_tao_find_in_IOR_table (object_id,
-                                                      object_reference);
-
-          // If ObjectID not in table or reference is nil raise
-          // OBJECT_NOT_EXIST.
-
-          if (status == -1 || CORBA::is_nil (object_reference))
-            ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST ());
-
-          // ObjectID present in the table with an associated NON-NULL
-          // reference.  Throw a forward request exception.
+                        "TAO (%P|%t) Illegal message received by server\n"));
+          TAO_GIOP::send_error (transport);
+          break;
 
-          CORBA::Object_ptr dup =
-            CORBA::Object::_duplicate (object_reference);
-
-          // @@ We could simply write the response at this point...
-          ACE_TRY_THROW (PortableServer::ForwardRequest (dup));
+        case TAO_GIOP::MessageError:
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO (%P|%t) MessageError received by server\n"));
+          break;
         }
-
-#endif /* TAO_NO_IOR_TABLE */
-
-      orb_core->object_adapter ()->dispatch_servant (request.object_key (),
-                                                     request,
-                                                     0,
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-    {
-      TAO_GIOP::start_message (version,
-                               TAO_GIOP::Reply,
-                               output,
-                               orb_core);
-      TAO_GIOP_ServiceContextList resp_ctx;
-      resp_ctx.length (0);
-      output << resp_ctx;
-
-      output.write_ulong (request_id);
-
-      output.write_ulong (TAO_GIOP_LOCATION_FORWARD);
-
-      CORBA::Object_ptr object_ptr =
-        forward_request.forward_reference.in();
-
-      output << object_ptr;
     }
-#else
-  ACE_UNUSED_ARG (request_id);
-#endif /* TAO_HAS_MINIMUM_CORBA */
   // Only CORBA exceptions are caught here.
   ACE_CATCHANY
     {
       if (response_required)
         {
-          if (TAO_GIOP::send_reply_exception (version,
-                                              transport,
+          if (TAO_GIOP::send_reply_exception (transport,
                                               orb_core,
                                               request_id,
                                               &ACE_ANY_EXCEPTION) == -1)
@@ -1082,12 +903,11 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
       if (response_required)
         {
           CORBA::UNKNOWN exception
-            (CORBA::SystemException::_tao_minor_code
+            (CORBA::SystemException::minor_code_tao_
              (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0),
              CORBA::COMPLETED_MAYBE);
 
-          if (TAO_GIOP::send_reply_exception (version,
-                                              transport,
+          if (TAO_GIOP::send_reply_exception (transport,
                                               orb_core,
                                               request_id,
                                               &exception) == -1)
@@ -1110,8 +930,6 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
                     "but client is not waiting a response\n"));
       return;
     }
-#else
-  ACE_UNUSED_ARG (response_required);
 #endif /* TAO_HAS_EXCEPTIONS */
   ACE_ENDTRY;
 
@@ -1126,6 +944,82 @@ TAO_GIOP::process_server_request (TAO_Transport *transport,
                 "TAO: (%P|%t) %p: cannot send reply\n",
                 "TAO_GIOP::process_server_message"));
 
+  TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END);
+}
+
+void
+TAO_GIOP::process_server_request (TAO_Transport *transport,
+                                  TAO_ORB_Core* orb_core,
+                                  TAO_InputCDR &input,
+                                  TAO_OutputCDR &output,
+                                  CORBA::Boolean &response_required,
+                                  CORBA::ULong &request_id,
+                                  CORBA::Environment &ACE_TRY_ENV)
+{
+  // This will extract the request header, set <response_required> as
+  // appropriate.
+  TAO_GIOP_ServerRequest request (input,
+                                  output,
+                                  orb_core,
+                                  ACE_TRY_ENV);
+  ACE_CHECK;
+
+  // The request_id_ field in request will be 0 if something went
+  // wrong before it got a chance to read it out.
+  request_id = request.request_id ();
+
+  response_required = request.response_expected ();
+
+#if !defined (TAO_NO_IOR_TABLE)
+  const CORBA::Octet *object_key =
+    request.object_key ().get_buffer ();
+
+  if (ACE_OS::memcmp (object_key,
+                      &TAO_POA::objectkey_prefix[0],
+                      TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
+    {
+      ACE_CString object_id (ACE_reinterpret_cast (const char *,
+                                                   object_key),
+                             request.object_key ().length (),
+                             0,
+                             0);
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "Simple Object key %s. Doing the Table Lookup ...\n",
+                    object_id.c_str ()));
+
+      CORBA::Object_ptr object_reference;
+
+      // Do the Table Lookup.
+      int status =
+        orb_core->orb ()->_tao_find_in_IOR_table (object_id,
+                                                  object_reference);
+
+      // If ObjectID not in table or reference is nil raise
+      // OBJECT_NOT_EXIST.
+
+      if (CORBA::is_nil (object_reference)
+          || status == -1)
+        ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
+
+      // ObjectID present in the table with an associated NON-NULL
+      // reference.  Throw a forward request exception.
+
+      CORBA::Object_ptr dup =
+        CORBA::Object::_duplicate (object_reference);
+
+      // @@ We could simply write the response at this point...
+      ACE_THROW (PortableServer::ForwardRequest (dup));
+    }
+
+#endif /* TAO_NO_IOR_TABLE */
+
+  orb_core->object_adapter ()->dispatch_servant (request.object_key (),
+                                                 request,
+                                                 0,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
 }
 
 void
@@ -1133,7 +1027,9 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport,
                                  TAO_ORB_Core* orb_core,
                                  TAO_InputCDR &input,
                                  TAO_OutputCDR &output,
-                                 const TAO_GIOP_Version& version)
+                                 CORBA::Boolean &response_required,
+                                 CORBA::ULong &request_id,
+                                 CORBA::Environment &ACE_TRY_ENV)
 {
   //  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START);
 
@@ -1144,14 +1040,14 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport,
   TAO_GIOP_LocateStatusType status = TAO_GIOP_UNKNOWN_OBJECT;
   CORBA::Object_var forward_location_var;
 
-  CORBA::Boolean response_required = 1;
-
-  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ();
   ACE_TRY
     {
       locateRequestHeader.init (input, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      request_id = locateRequestHeader.request_id;
+      response_required = 1;
+
 #if !defined (TAO_NO_IOR_TABLE)
 
       const CORBA::Octet *object_key =
@@ -1209,18 +1105,13 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport,
                              locateRequestHeader.object_key.get_buffer (),
                              0);
 
-      int parse_error;
       TAO_GIOP_ServerRequest serverRequest (locateRequestHeader.request_id,
                                             response_required,
                                             tmp_key,
                                             "_non_existent",
                                             dummy_output,
                                             orb_core,
-                                            version,
-                                            parse_error);
-      if (parse_error != 0)
-        ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-                                       CORBA::COMPLETED_NO));
+                                            ACE_TRY_ENV);
 
       orb_core->object_adapter ()->dispatch_servant (serverRequest.object_key (),
                                                      serverRequest,
@@ -1269,27 +1160,13 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport,
     {
       // Normal exception, so the object is not here
       status = TAO_GIOP_UNKNOWN_OBJECT;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) TAO_GIOP::process_server_locate - "
-                    "CORBA exception raised\n"));
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // Normal exception, so the object is not here
-      status = TAO_GIOP_UNKNOWN_OBJECT;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) TAO_GIOP::process_server_locate - "
-                    "C++ exception raised\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "handle_locate has been called: not here\n"));
     }
-#endif /* TAO_HAS_EXCEPTIONS */
   ACE_ENDTRY;
 
   // Create the response.
-  TAO_GIOP::start_message (version,
-                           TAO_GIOP::LocateReply,
+  TAO_GIOP::start_message (TAO_GIOP::LocateReply,
                            output,
                            orb_core);
   output.write_ulong (locateRequestHeader.request_id);
@@ -1302,23 +1179,16 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport,
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "TAO (%P|%t) TAO_GIOP::process_server_request -"
-                        " cannot marshal object reference\n"));
+                        "Server_Connection_Handler::handle_locate - "
+                        "error marshaling forwarded reference\n"));
+          ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+                                     CORBA::COMPLETED_YES));
         }
     }
-
-  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
-TAO_GIOP::send_reply_exception (const TAO_GIOP_Version &version,
-                                TAO_Transport *transport,
+TAO_GIOP::send_reply_exception (TAO_Transport *transport,
                                 TAO_ORB_Core* orb_core,
                                 CORBA::ULong request_id,
                                 CORBA::Exception *x)
@@ -1341,8 +1211,7 @@ TAO_GIOP::send_reply_exception (const TAO_GIOP_Version &version,
                         orb_core->to_unicode ());
 
   // Construct a REPLY header.
-  TAO_GIOP::start_message (version,
-                           TAO_GIOP::Reply,
+  TAO_GIOP::start_message (TAO_GIOP::Reply,
                            output,
                            orb_core);
 
@@ -1358,25 +1227,56 @@ TAO_GIOP::send_reply_exception (const TAO_GIOP_Version &version,
       // Write the request ID
       output.write_ulong (request_id);
 
-      // Write the exception
-      CORBA::TypeCode_ptr except_tc = x->_type ();
+#if !defined (TAO_HAS_MINIMUM_CORBA)
 
-      CORBA::exception_type extype =
-        CORBA::USER_EXCEPTION;
+      // @@ TODO This is the place to conditionally compile
+      // forwarding. It certainly seems easy to strategize too, just
+      // invoke an strategy to finish marshalling the response.
 
-      if (CORBA::SystemException::_narrow (x) != 0)
-        extype = CORBA::SYSTEM_EXCEPTION;
+      // Now we check for Forwarding ***************************
 
-      // write the reply_status
-      output.write_ulong (TAO_GIOP::convert_CORBA_to_GIOP_exception (extype));
+      // Try to narrow to ForwardRequest
+      PortableServer::ForwardRequest_ptr forward_request_ptr =
+        PortableServer::ForwardRequest::_narrow (x);
 
-      // @@ Any way to implement this without interpretive
-      //    marshaling???
-      output.encode (except_tc,
-                     x,
-                     0,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // If narrowing of exception succeeded
+      if (forward_request_ptr != 0
+          && !CORBA::is_nil (forward_request_ptr->forward_reference.in ()))
+        {
+          // write the reply_status
+          output.write_ulong (TAO_GIOP_LOCATION_FORWARD);
+
+          // write the object reference into the stream
+          CORBA::Object_ptr object_ptr =
+            forward_request_ptr->forward_reference.in();
+
+          output << object_ptr;
+        }
+      // end of the forwarding code ****************************
+      else
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+        {
+          // Write the exception
+          CORBA::TypeCode_ptr except_tc = x->_type ();
+
+          CORBA::exception_type extype =
+            CORBA::USER_EXCEPTION;
+
+          if (CORBA::SystemException::_narrow (x) != 0)
+            extype = CORBA::SYSTEM_EXCEPTION;
+
+          // write the reply_status
+          output.write_ulong (TAO_GIOP::convert_CORBA_to_GIOP_exception (extype));
+
+          // @@ Any way to implement this without interpretive
+          //    marshaling???
+          output.encode (except_tc,
+                         x,
+                         0,
+                         ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
     }
   ACE_CATCH (CORBA_Exception, ex)
     {
@@ -1398,8 +1298,7 @@ TAO_GIOP::send_reply_exception (const TAO_GIOP_Version &version,
 }
 
 CORBA::Boolean
-TAO_GIOP::start_message_std (const TAO_GIOP_Version &version,
-                             TAO_GIOP::Message_Type type,
+TAO_GIOP::start_message_std (TAO_GIOP::Message_Type type,
                              TAO_OutputCDR &msg)
 {
   msg.reset ();
@@ -1407,7 +1306,7 @@ TAO_GIOP::start_message_std (const TAO_GIOP_Version &version,
   // if (msg.size () < TAO_GIOP_HEADER_LEN)
   // return 0;
 
-  static CORBA::Octet magic[] =
+  static CORBA::Octet header[] =
   {
     // The following works on non-ASCII platforms, such as MVS (which
     // uses EBCDIC).
@@ -1415,13 +1314,15 @@ TAO_GIOP::start_message_std (const TAO_GIOP_Version &version,
     0x49, // 'I'
     0x4f, // 'O'
     0x50, // 'P'
+    TAO_GIOP_MessageHeader::MY_MAJOR,
+    TAO_GIOP_MessageHeader::MY_MINOR,
+    TAO_ENCAP_BYTE_ORDER
   };
 
-  static int magic_size = sizeof(magic)/sizeof(magic[0]);
-  msg.write_octet_array (magic, magic_size);
-  msg.write_octet (version.major);
-  msg.write_octet (version.minor);
-  msg.write_octet (TAO_ENCAP_BYTE_ORDER);
+  static int header_size =
+    sizeof(header)/sizeof(header[0]);
+  msg.write_octet_array (header,
+                         header_size);
   msg.write_octet (type);
 
   // Write a dummy <size> later it is set to the right value...
@@ -1432,8 +1333,7 @@ TAO_GIOP::start_message_std (const TAO_GIOP_Version &version,
 }
 
 CORBA::Boolean
-TAO_GIOP::start_message_lite (const TAO_GIOP_Version &version,
-                              TAO_GIOP::Message_Type type,
+TAO_GIOP::start_message_lite (TAO_GIOP::Message_Type type,
                               TAO_OutputCDR &msg)
 {
   msg.reset ();
@@ -1459,8 +1359,6 @@ TAO_GIOP::write_request_header_std (const TAO_GIOP_ServiceContextList& svc_ctx,
 {
   out_stream << svc_ctx;
   out_stream << request_id;
-  // @@ Messaging: this is where the extra synchronization information
-  //    should be stored.
   out_stream << CORBA::Any::from_boolean (is_roundtrip);
   out_stream << key;
   out_stream << opname;
@@ -1487,17 +1385,19 @@ TAO_GIOP::write_request_header_lite (const TAO_GIOP_ServiceContextList&,
 int
 TAO_GIOP::parse_header (TAO_ORB_Core *orb_core,
                         TAO_InputCDR &input,
-                        TAO_GIOP_Message_State& state)
+                        TAO_GIOP_MessageHeader& header)
 {
   if (orb_core->orb_params ()->use_lite_protocol ())
-    return TAO_GIOP::parse_header_lite (input, state);
+    return TAO_GIOP::parse_header_lite (input,
+                                        header);
   else
-    return TAO_GIOP::parse_header_std (input, state);
+    return TAO_GIOP::parse_header_std (input,
+                                       header);
 }
 
 int
 TAO_GIOP::parse_header_std (TAO_InputCDR &input,
-                            TAO_GIOP_Message_State &state)
+                            TAO_GIOP_MessageHeader &header)
 {
   char *buf = input.rd_ptr ();
 
@@ -1517,82 +1417,55 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &input,
       return -1;
     }
 
-  state.giop_version.major = buf[TAO_GIOP_VERSION_MAJOR_OFFSET];
-  state.giop_version.minor = buf[TAO_GIOP_VERSION_MINOR_OFFSET];
-
-  if (state.giop_version.major != TAO_DEF_GIOP_MAJOR
-      || state.giop_version.minor > TAO_DEF_GIOP_MINOR)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) bad version <%d.%d>\n",
-                    state.giop_version.major,
-                    state.giop_version.minor));
-      return -1;
-    }
-
-  if (state.giop_version.minor == 0)
-    {
-      state.byte_order = buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET];
-      if (TAO_debug_level > 2
-          && state.byte_order != 0 && state.byte_order != 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) invalid byte order <%d>"
-                      " for version <1.0>\n",
-                      state.byte_order));
-          return -1;
-        }
-    }
-  else
-    {
-      state.byte_order     = buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01;
-      state.more_fragments = buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x02;
-      if (TAO_debug_level > 2
-          && state.giop_version.minor == 1
-          && (buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & ~0x3) != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) invalid flags for <%d>"
-                      " for version <1.1>\n",
-                      buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET]));
-          return -1;
-        }
-
-    }
-
-  state.message_type = buf[TAO_GIOP_MESSAGE_TYPE_OFFSET];
-
-  input.reset_byte_order (state.byte_order);
+#if 0
+  // @@ Nobody uses this magic number, no sense in wasting time here.
+  header.magic[0] = 0x47; // 'G'
+  header.magic[1] = 0x49; // 'I'
+  header.magic[2] = 0x4f; // 'O'
+  header.magic[3] = 0x50; // 'P'
+#endif /* 0 */
+  header.giop_version.major = buf[4];
+  header.giop_version.minor = buf[5];
+  header.byte_order = buf[6];
+  header.message_type = buf[7];
+
+  input.reset_byte_order (header.byte_order);
   input.skip_bytes (TAO_GIOP_MESSAGE_SIZE_OFFSET);
-  input.read_ulong (state.message_size);
+  input.read_ulong (header.message_size);
 
   if (TAO_debug_level > 2)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) Parsed header = <%d,%d,%d,%d,%d>\n",
-                  state.giop_version.major,
-                  state.giop_version.minor,
-                  state.byte_order,
-                  state.message_type,
-                  state.message_size));
+                  header.giop_version.major,
+                  header.giop_version.minor,
+                  header.byte_order,
+                  header.message_type,
+                  header.message_size));
     }
   return 0;
 }
 
 int
 TAO_GIOP::parse_header_lite (TAO_InputCDR &input,
-                             TAO_GIOP_Message_State &state)
+                             TAO_GIOP_MessageHeader &header)
 {
   char *buf = input.rd_ptr ();
 
-  state.giop_version.major = TAO_DEF_GIOP_MAJOR;
-  state.giop_version.minor = TAO_DEF_GIOP_MINOR;
-  state.byte_order = TAO_ENCAP_BYTE_ORDER;
-  state.message_type = buf[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET];
-
-  input.reset_byte_order (state.byte_order);
-  input.read_ulong (state.message_size);
+#if 0
+  // @@ Nobody uses this magic number, no sense in wasting time here.
+  header.magic[0] = 0x47; // 'G'
+  header.magic[1] = 0x49; // 'I'
+  header.magic[2] = 0x4f; // 'O'
+  header.magic[3] = 0x50; // 'P'
+#endif /* 0 */
+  header.giop_version.major = 1;
+  header.giop_version.minor = 0;
+  header.byte_order = TAO_ENCAP_BYTE_ORDER;
+  header.message_type = buf[4];
+
+  input.reset_byte_order (header.byte_order);
+  input.read_ulong (header.message_size);
   return 0;
 }
 
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index b15f91ead9f..f817e9c8dce 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -37,7 +37,6 @@
 
 #include "tao/corbafwd.h"
 #include "tao/Sequence.h"
-#include "tao/CDR.h"
 
 class TAO_Transport;
 class TAO_ORB_Core;
@@ -53,11 +52,10 @@ typedef CORBA::ULong TAO_IOP_Profile_ID;
 
 enum
 {
-  TAO_IOP_TAG_INVALID = -1,
-  TAO_IOP_TAG_INTERNET_IOP = 0,                // IIOP
-  TAO_IOP_TAG_MULTIPLE_COMPONENTS = 1,         // DCE-CIOP
-  TAO_IOP_TAG_UNIX_IOP = TAO_TAG_UIOP_PROFILE, // Read corbafwd.h
-
+  TAO_IOP_TAG_INVALID = -1,        //
+  TAO_IOP_TAG_INTERNET_IOP = 0,        // IIOP
+  TAO_IOP_TAG_MULTIPLE_COMPONENTS = 1, // DCE-CIOP
+  TAO_IOP_TAG_UNIX_IOP = 1000,  // @@ Temporary hack for UIOP!
   // = This is a subset of the list of other profile tags.
   TAO_IOP_TAG_ONC_IOP = 0x4f4e4300     // ONC IOP
 };
@@ -126,141 +124,59 @@ public:
   TAO_opaque component_data;
 };
 
-// ****************************************************************
-
 typedef TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>
         TAO_IOP_MultipleComponentProfile;
 
-class TAO_Export TAO_GIOP_Version
+// namespace TAO_GIOP
+
+struct TAO_GIOP_Version
 {
-  // = TITLE
-  //   Major and Minor version number of the Inter-ORB Protocol.
-public:
   CORBA::Octet major;
-  // Major version number
-
   CORBA::Octet minor;
-  // Minor version number
-
-  TAO_GIOP_Version (const TAO_GIOP_Version &src);
-  // Copy constructor
-
-  TAO_GIOP_Version (CORBA::Octet maj = TAO_DEF_GIOP_MAJOR,
-                    CORBA::Octet min = TAO_DEF_GIOP_MINOR);
-  // Default constructor.
-
-  ~TAO_GIOP_Version (void);
-  // Destructor.
-
-  void set_version (CORBA::Octet maj, CORBA::Octet min);
-  // Explicitly set the major and minor version.
-
-  TAO_GIOP_Version &operator= (const TAO_GIOP_Version &src);
-  // Copy operator.
-
-  int operator== (const TAO_GIOP_Version &src);
-  int operator!= (const TAO_GIOP_Version &src);
-  // Equality operator
 };
 
-// ****************************************************************
-
-class TAO_Export TAO_GIOP_Message_State
+class TAO_GIOP_MessageHeader
 {
   // = TITLE
-  //   Represent the state of an incoming GIOP message.
-  //
-  // = DESCRIPTION
-  //   As the ORB processes a GIOP messages it needs to keep track of
-  //   how much of the message has been read, if there are any
-  //   fragments following this message, the contents of the header,
-  //   etc.
-  //   Notice that it is not a direct mapping from the
-  //   GIOP::MessageHeader IDL structure, for example, the message
-  //   flags introduced in GIOP 1.1 are expanded in several fields.
+  //   This is the header sent with ever GIOP request!
 
 public:
-  TAO_GIOP_Message_State (TAO_ORB_Core* orb_core);
+
+  TAO_GIOP_MessageHeader (void);
   // Constructor.
-  // The parameters are used to initialize the InputCDR stream
-
-  void reset (void);
-  // Reset the message header state and prepare it to receive the next
-  // event.
-  // already read.
-  // This method will reset the header to indicate that the last
-  // message was procesno data (not
-  // event the
-
-  int header_received (void) const;
-  // Has the header been received?
-
-  int is_complete (void);
-  // Check if the current message is complete, adjusting the fragments
-  // if required...
-
-  // = The GIOP header for the current fragment...
-  CORBA::Octet magic [4];        // "GIOP"
-  TAO_GIOP_Version giop_version; // 1.1 or 1.0
-  CORBA::Octet byte_order;       // 0 = big, 1 = little
-  CORBA::Octet more_fragments;   // For GIOP 1.1 (Requests and Replys)
-  CORBA::Octet message_type;     // MsgType above
-  CORBA::ULong message_size;     // in byte_order!
-
-  CORBA::ULong current_offset;
-  // How much of the payload has been received
-
-  TAO_InputCDR cdr;
-  // This is the InputCDR that will be used to decode the message.
-
-  ACE_Message_Block* fragments_begin;
-  ACE_Message_Block* fragments_end;
-  // The fragments are collected in a chain of message blocks (using
-  // the cont() field).  When the complete message is received the
-  // chain is reassembled into <cdr>
-
-  CORBA::Octet first_fragment_byte_order;
-  // The byte order for the the first fragment
-  // @@ The current implementation cannot handle fragments with
-  //    different byte orders, this should not be a major problem
-  //    because:
-  //    1) It is unlikely that we are going to receive fragments.
-  //    2) The spec *seems* to allow different byte_orders, but it is
-  //       unlikely that any ORB will do that.
-  //    3) Even if we allowed that at this layer the CDR classes are
-  //       not prepared to handle that.
-
-  TAO_GIOP_Version first_fragment_giop_version;
-  // The GIOP version for the first fragment
-  // @@ Same as above, all GIOP versions must match.
-
-  CORBA::Octet first_fragment_message_type;
-  // If the messages are chained this represents the message type for
-  // the *complete* message (remember that the last message will be
-  // fragment and the upper level needs to know if it is a request,
-  // locate request or what).
 
-private:
-  int append_fragment (ACE_Message_Block* current);
-  // Append <current> to the list of fragments
-  // Also resets the state, because the current message was consumed.
+  // version numbers
+  enum
+  {
+    // = DESCRIPTION
+    //   GIOP protocol version 1.0 information.
+
+    MY_MAJOR = 1,
+    MY_MINOR = 0
+  };
+
+  CORBA::Octet magic [4]; // "GIOP"
+  TAO_GIOP_Version giop_version;
+  CORBA::Octet byte_order; // 0 = big, 1 = little
+  CORBA::Octet message_type; // MsgType above
+  CORBA::ULong message_size; // in byte_order!
 };
 
-// The GIOP message header size
+// defined by GIOP 1.0 protocol @@ Is this portable? The structure
+// above could have some padding on machines with absurd padding
+// requirements (like 8 byte boundaries); hence the size of it may not
+// match the size of the header on the wire.
+//#define       TAO_GIOP_HEADER_LEN sizeof (TAO_GIOP_MessageHeader)
+// @@ - I made this explicitly 12 (ASG)
 #define TAO_GIOP_HEADER_LEN 12
 
 // The offset the message_size field inside the GIOP HEADER
-#define TAO_GIOP_VERSION_MAJOR_OFFSET 4
-#define TAO_GIOP_VERSION_MINOR_OFFSET 5
-#define TAO_GIOP_MESSAGE_FLAGS_OFFSET 6
-#define TAO_GIOP_MESSAGE_TYPE_OFFSET 7
 #define TAO_GIOP_MESSAGE_SIZE_OFFSET 8
 
 // The IIOP Lite header length and the offset of the message size
 // field in it.
 #define TAO_GIOP_LITE_HEADER_LEN 5
 #define TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET 0
-#define TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET 4
 
 // Support for Implicit ORB Service Context.
 typedef CORBA::ULong TAO_GIOP_ServiceID;
@@ -276,8 +192,6 @@ enum
   // This is where our RIOP service ID will be defined...
 };
 
-// namespace TAO_GIOP
-
 class TAO_GIOP_ServiceContext
 {
   // = TITLE
@@ -407,18 +321,17 @@ public:
     Fragment = 7                // by both.
   };
 
-  static void close_connection (const TAO_GIOP_Version &version,
-                                TAO_Transport *transport,
+  static void close_connection (TAO_Transport *transport,
                                 void *ctx);
   // Close a connection, first sending GIOP::CloseConnection.
 
-  static CORBA::Boolean start_message (const TAO_GIOP_Version &version,
-                                       TAO_GIOP::Message_Type t,
+  static CORBA::Boolean start_message (TAO_GIOP::Message_Type t,
                                        TAO_OutputCDR &msg,
                                        TAO_ORB_Core* orb_core);
   // Build the header for a message of type <t> into stream <msg>.
 
-  static CORBA::Boolean write_request_header (CORBA::ULong request_id,
+  static CORBA::Boolean write_request_header (const TAO_GIOP_ServiceContextList& svc_ctx,
+                                              CORBA::ULong request_id,
                                               CORBA::Boolean is_roundtrip,
                                               const TAO_opaque& key,
                                               const char* opname,
@@ -442,8 +355,7 @@ public:
                         size_t len);
   // Print out a message header.
 
-  static void send_error (const TAO_GIOP_Version &version,
-                          TAO_Transport *transport);
+  static void send_error (TAO_Transport *transport);
   // Send an error message back to a caller.
 
   static ssize_t read_buffer (TAO_Transport *transport,
@@ -457,29 +369,34 @@ public:
 
   static int read_header (TAO_Transport *transport,
                           TAO_ORB_Core *orb_core,
-                          TAO_GIOP_Message_State &state,
+                          TAO_GIOP_MessageHeader &header,
                           CORBA::ULong &header_size,
                           TAO_InputCDR &input);
   static int handle_input (TAO_Transport *transport,
                            TAO_ORB_Core *orb_core,
-                           TAO_GIOP_Message_State &state);
+                           TAO_GIOP_MessageHeader &header,
+                           CORBA::ULong &current_offset,
+                           TAO_InputCDR& input);
 
   static int parse_reply (TAO_Transport *transport,
                           TAO_ORB_Core *orb_core,
-                          TAO_GIOP_Message_State& state,
+                          TAO_InputCDR& input,
+                          const TAO_GIOP_MessageHeader& header,
                           TAO_GIOP_ServiceContextList& reply_ctx,
                           CORBA::ULong& request_id,
                           CORBA::ULong& reply_status);
   static void process_server_message (TAO_Transport *transport,
                                       TAO_ORB_Core *orb_core,
-                                      TAO_InputCDR &input,
-                                      const TAO_GIOP_Message_State& state);
+                                      TAO_InputCDR &cdr,
+                                      const TAO_GIOP_MessageHeader& header);
 
   static void process_server_request (TAO_Transport *transport,
                                       TAO_ORB_Core* orb_core,
                                       TAO_InputCDR &input,
                                       TAO_OutputCDR &output,
-                                      const TAO_GIOP_Version& version);
+                                      CORBA::Boolean &response_required,
+                                      CORBA::ULong &request_id,
+                                      CORBA::Environment &ACE_TRY_ENV);
   // A request was received on the server side.
   // <transport> is the source of the message (and thus where the
   // replies should be sent).
@@ -493,7 +410,9 @@ public:
                                      TAO_ORB_Core* orb_core,
                                      TAO_InputCDR &input,
                                      TAO_OutputCDR &output,
-                                     const TAO_GIOP_Version& version);
+                                     CORBA::Boolean &response_required,
+                                     CORBA::ULong &request_id,
+                                     CORBA::Environment &ACE_TRY_ENV);
   // A LocateRequest was received on the server side.
   // <transport> is the source of the message (and thus where the
   // replies should be sent).
@@ -503,8 +422,7 @@ public:
   // <request_id> and <response_required> are set as part of the
   // message processing.
 
-  static int send_reply_exception (const TAO_GIOP_Version &version,
-                                   TAO_Transport *transport,
+  static int send_reply_exception (TAO_Transport *transport,
                                    TAO_ORB_Core* orb_core,
                                    CORBA::ULong request_id,
                                    CORBA::Exception *x);
@@ -512,14 +430,12 @@ public:
   // resulted in some kind of exception.
 
 private:
-  static CORBA::Boolean start_message_std (const TAO_GIOP_Version &version,
-                                           TAO_GIOP::Message_Type t,
+  static CORBA::Boolean start_message_std (TAO_GIOP::Message_Type t,
                                            TAO_OutputCDR &msg);
   // Build the standard header for a message of type <t> into
   // stream <msg>.
 
-  static CORBA::Boolean start_message_lite (const TAO_GIOP_Version &version,
-                                            TAO_GIOP::Message_Type t,
+  static CORBA::Boolean start_message_lite (TAO_GIOP::Message_Type t,
                                             TAO_OutputCDR &msg);
   // Build the lightweight header for a message of type <t> into
   // stream <msg>.
@@ -546,14 +462,14 @@ private:
 
   static int parse_header (TAO_ORB_Core *orb_core,
                            TAO_InputCDR &input,
-                           TAO_GIOP_Message_State& state);
+                           TAO_GIOP_MessageHeader& header);
   // Parse the header, extracting all the relevant info.
 
   static int parse_header_std (TAO_InputCDR &input,
-                               TAO_GIOP_Message_State& state);
+                               TAO_GIOP_MessageHeader& header);
 
   static int parse_header_lite (TAO_InputCDR &input,
-                                TAO_GIOP_Message_State& state);
+                                TAO_GIOP_MessageHeader& header);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/GIOP.i b/TAO/tao/GIOP.i
index c35b9c24676..ee8855c9029 100644
--- a/TAO/tao/GIOP.i
+++ b/TAO/tao/GIOP.i
@@ -8,72 +8,3 @@ TAO_GIOP_LocateRequestHeader::TAO_GIOP_LocateRequestHeader (void)
   : request_id (0)
 {
 }
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_GIOP_Version::TAO_GIOP_Version (const TAO_GIOP_Version &src)
-  : major (src.major),
-    minor (src.minor)
-{
-}
-
-ACE_INLINE
-TAO_GIOP_Version::TAO_GIOP_Version (CORBA::Octet maj, CORBA::Octet min)
-  : major (maj),
-    minor (min)
-{
-}
-
-ACE_INLINE
-TAO_GIOP_Version::~TAO_GIOP_Version (void)
-{
-}
-
-ACE_INLINE TAO_GIOP_Version &
-TAO_GIOP_Version::operator= (const TAO_GIOP_Version &src)
-{
-  if (this == &src)
-    return *this;
-
-  this->major = src.major;
-  this->minor = src.minor;
-  return *this;
-}
-
-ACE_INLINE void
-TAO_GIOP_Version::set_version (CORBA::Octet maj, CORBA::Octet min)
-{
-  this->major = maj;
-  this->minor = min;
-}
-
-ACE_INLINE int
-TAO_GIOP_Version::operator== (const TAO_GIOP_Version &src)
-{
-  return this->major == src.major && this->minor == src.minor;
-}
-
-ACE_INLINE int
-TAO_GIOP_Version::operator!= (const TAO_GIOP_Version &src)
-{
-  return !(*this == src);
-}
-
-// ****************************************************************
-
-ACE_INLINE void
-TAO_GIOP_Message_State::reset (void)
-{
-  this->message_size = 0;
-  this->current_offset = 0;
-  this->more_fragments = 0;
-  // Does this involve a memory allocation? Could we eliminate it?
-  ACE_Message_Block::release (this->cdr.steal_contents ());
-}
-
-ACE_INLINE int
-TAO_GIOP_Message_State::header_received (void) const
-{
-  return this->message_size != 0;
-}
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
index 7a5edeeac61..c0f71ad6278 100644
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ b/TAO/tao/GIOP_Server_Request.cpp
@@ -40,12 +40,10 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
-TAO_GIOP_ServerRequest::
-    TAO_GIOP_ServerRequest (TAO_InputCDR &input,
-                            TAO_OutputCDR &output,
-                            TAO_ORB_Core *orb_core,
-                            const TAO_GIOP_Version &version,
-                            int &parse_error)
+TAO_GIOP_ServerRequest::TAO_GIOP_ServerRequest (TAO_InputCDR &input,
+                                                TAO_OutputCDR &output,
+                                                TAO_ORB_Core *orb_core,
+                                                CORBA::Environment &env)
   : incoming_ (&input),
     outgoing_ (&output),
     response_expected_ (0),
@@ -60,7 +58,6 @@ TAO_GIOP_ServerRequest::
     exception_ (0),
     exception_type_ (TAO_GIOP_NO_EXCEPTION),
     orb_core_ (orb_core),
-    version_ (version),
     service_info_ (),
     request_id_ (0),
     object_key_ (),
@@ -68,11 +65,11 @@ TAO_GIOP_ServerRequest::
 {
   ACE_FUNCTION_TIMEPROBE (TAO_SERVER_REQUEST_START);
 
-  parse_error = this->parse_header ();
+  this->parse_header (env);
 }
 
-int
-TAO_GIOP_ServerRequest::parse_header_std (void)
+void
+TAO_GIOP_ServerRequest::parse_header_std (CORBA::Environment &ACE_TRY_ENV)
 {
   // Tear out the service context ... we currently ignore it, but it
   // should probably be passed to each ORB service as appropriate
@@ -112,8 +109,6 @@ TAO_GIOP_ServerRequest::parse_header_std (void)
   if (hdr_status)
     {
       // Do not include NULL character at the end.
-      // @@ This is not getting demarshaled using the codeset
-      //    translators!
       this->operation_.set (input.rd_ptr (),
                             length - 1,
                             0);
@@ -126,11 +121,13 @@ TAO_GIOP_ServerRequest::parse_header_std (void)
       hdr_status = input.good_bit ();
     }
 
-  return hdr_status ? 0 : -1;
+  if (!hdr_status)
+    ACE_THROW (CORBA::COMM_FAILURE ());
+
 }
 
-int
-TAO_GIOP_ServerRequest::parse_header_lite (void)
+void
+TAO_GIOP_ServerRequest::parse_header_lite (CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_InputCDR& input = *this->incoming_;
 
@@ -160,37 +157,36 @@ TAO_GIOP_ServerRequest::parse_header_lite (void)
   if (hdr_status)
     {
       // Do not include NULL character at the end.
-      // @@ This is not getting demarshaled using the codeset
-      //    translators!
       this->operation_.set (input.rd_ptr (),
                             length - 1,
                             0);
       hdr_status = input.skip_bytes (length);
     }
 
-  return hdr_status ? 0 : -1;
+  if (!hdr_status)
+    ACE_THROW (CORBA::COMM_FAILURE ());
 }
 
-int
-TAO_GIOP_ServerRequest::parse_header (void)
+
+
+void
+TAO_GIOP_ServerRequest::parse_header (CORBA::Environment &env)
 {
   if (this->orb_core_->orb_params ()->use_lite_protocol ())
-    return this->parse_header_lite ();
+    this->parse_header_lite (env);
   else
-    return this->parse_header_std ();
+    this->parse_header_std (env);
 }
 
 // This constructor is used, by the locate request code
 
-TAO_GIOP_ServerRequest::
-    TAO_GIOP_ServerRequest (CORBA::ULong &request_id,
-                            CORBA::Boolean &response_expected,
-                            TAO_ObjectKey &object_key,
-                            const ACE_CString &operation,
-                            TAO_OutputCDR &output,
-                            TAO_ORB_Core *orb_core,
-                            const TAO_GIOP_Version &version,
-                            int &parse_error)
+TAO_GIOP_ServerRequest::TAO_GIOP_ServerRequest (CORBA::ULong &request_id,
+                                                CORBA::Boolean &response_expected,
+                                                TAO_ObjectKey &object_key,
+                                                const ACE_CString &operation,
+                                                TAO_OutputCDR &output,
+                                                TAO_ORB_Core *orb_core,
+                                                CORBA::Environment &)
   : operation_ (operation),
     incoming_ (0),
     outgoing_ (&output),
@@ -206,13 +202,11 @@ TAO_GIOP_ServerRequest::
     exception_ (0),
     exception_type_ (TAO_GIOP_NO_EXCEPTION),
     orb_core_ (orb_core),
-    version_ (version),
     service_info_ (0),
     request_id_ (request_id),
     object_key_ (object_key),
     requesting_principal_ (0)
 {
-  parse_error = 0;
 }
 
 TAO_GIOP_ServerRequest::~TAO_GIOP_ServerRequest (void)
@@ -491,7 +485,7 @@ TAO_GIOP_ServerRequest::demarshal (CORBA::Environment &orb_env,
 // Extension
 
 void
-TAO_GIOP_ServerRequest::marshal (CORBA::Environment &ACE_TRY_ENV,
+TAO_GIOP_ServerRequest::marshal (CORBA::Environment &orb_env,
                                  // ORB related exception reporting
                                  //                             CORBA::Environment &skel_env,
                                  // skeleton related exception reporting
@@ -499,7 +493,7 @@ TAO_GIOP_ServerRequest::marshal (CORBA::Environment &ACE_TRY_ENV,
                                  // call description
                                  ...)
 {
-  // what is "ACE_TRY_ENV" and "skel_env"?
+  // what is "orb_env" and "skel_env"?
   // "skel_env" holds the exception that got raised inside the operation
   // implementation (upcall)
   //
@@ -527,67 +521,57 @@ TAO_GIOP_ServerRequest::marshal (CORBA::Environment &ACE_TRY_ENV,
   // Setup a Reply message so that we can marshal all the outgoing parameters
   // into it. If an exception was set, then that gets marshaled into the reply
   // message and we don't do anything after that
-  this->init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->init_reply (orb_env);
 
 #if 0 /* ASG */
   // exception? nothing to do after this
   if (orb_env.exception () || skel_env.exception ())
     return;
-  ACE_CHECK;
 #endif
+  TAO_CHECK_ENV_RETURN_VOID (orb_env);
 
   CORBA::ULong i;
   const TAO_Param_Data_Skel *pdp;
   va_list param_vector;
   va_start (param_vector, info);
 
-  ACE_TRY
+  for (i = 0, pdp = info->params;
+       i < info->param_count;
+       i++, pdp++)
     {
-      for (i = 0, pdp = info->params;
-           i < info->param_count;
-           i++, pdp++)
-        {
-          void *ptr = va_arg (param_vector, void *);
+      void *ptr = va_arg (param_vector, void *);
 
-          if (pdp->mode == 0)
-            {
-              // check if the return type is not void
-              CORBA::TCKind result = pdp->tc->kind (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              if (result != CORBA::tk_void)
-                {
-                  // Then just marshal the value.
-                  (void) this->outgoing_->encode (pdp->tc, ptr, 0, ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
-                }
-            }
-          else if ((pdp->mode == CORBA::ARG_INOUT)
-                   || (pdp->mode == CORBA::ARG_OUT))
+      if (pdp->mode == 0)
+        {
+          // check if the return type is not void
+          if (pdp->tc->kind (orb_env) != CORBA::tk_void)
             {
               // Then just marshal the value.
-              (void) this->outgoing_->encode (pdp->tc, ptr, 0, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              (void) this->outgoing_->encode (pdp->tc, ptr, 0, orb_env);
             }
         }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "TAO_GIOP_ServerRequest::marshal - parameter encode failed");
-      return;
-    }
-  ACE_ENDTRY;
+      else if ((pdp->mode == CORBA::ARG_INOUT)
+          || (pdp->mode == CORBA::ARG_OUT))
+        {
+          // Then just marshal the value.
+          (void) this->outgoing_->encode (pdp->tc, ptr, 0, orb_env);
+        }
 
+      if (orb_env.exception ())
+        {
+          orb_env.print_exception ("TAO_GIOP_ServerRequest::marshal - parameter encode failed");
+          return;
+        }
+    }
   va_end (param_vector);
+
 }
 
 void
-TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &env)
 {
   // Construct a REPLY header.
-  TAO_GIOP::start_message (this->version_,
-                           TAO_GIOP::Reply,
+  TAO_GIOP::start_message (TAO_GIOP::Reply,
                            *this->outgoing_,
                            this->orb_core_);
 
@@ -614,12 +598,7 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV)
     }
 
   // Any exception at all.
-  else if (this->exception_ == 0)
-    {
-      // First finish the GIOP header ...
-      this->outgoing_->write_ulong (TAO_GIOP_NO_EXCEPTION);
-    }
-  else
+  else if (this->exception_)
     {
       CORBA::TypeCode_ptr except_tc;
 
@@ -632,8 +611,11 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV)
 
       // we use the any's ACE_Message_Block
       TAO_InputCDR cdr (this->exception_->_tao_get_cdr ());
-      (void) this->outgoing_->append (except_tc, &cdr, ACE_TRY_ENV);
+      (void) this->outgoing_->append (except_tc, &cdr, env);
     }
+  else // Normal reply
+    // First finish the GIOP header ...
+    this->outgoing_->write_ulong (TAO_GIOP_NO_EXCEPTION);
 }
 
 CORBA::Object_ptr
diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h
index 77ee397b5e1..52b182a8c39 100644
--- a/TAO/tao/GIOP_Server_Request.h
+++ b/TAO/tao/GIOP_Server_Request.h
@@ -34,8 +34,8 @@ public:
   TAO_GIOP_ServerRequest (TAO_InputCDR &input,
                           TAO_OutputCDR &output,
                           TAO_ORB_Core *orb_core,
-                          const TAO_GIOP_Version &version,
-                          int &parse_error);
+                          CORBA_Environment &TAO_IN_ENV =
+                              TAO_default_environment ());
   // Constructor
   TAO_GIOP_ServerRequest (CORBA::ULong &request_id,
                           CORBA::Boolean &response_expected,
@@ -43,8 +43,8 @@ public:
                           const ACE_CString &operation,
                           TAO_OutputCDR &output,
                           TAO_ORB_Core *orb_core,
-                          const TAO_GIOP_Version &version,
-                          int &parse_error);
+                          CORBA_Environment &TAO_IN_ENV =
+                             TAO_default_environment ());
 
   virtual ~TAO_GIOP_ServerRequest (void);
   // Destructor.
@@ -144,14 +144,14 @@ public:
   // get the exception type
 
 private:
-  int parse_header (void);
+   void parse_header (CORBA::Environment &TAO_IN_ENV);
   // Parse the request header and store the result on this object.
 
-  int parse_header_std (void);
+  void parse_header_std (CORBA::Environment &TAO_IN_ENV);
   // Parse the standard GIOP request header and store the result on
   // this object.
 
-  int parse_header_lite (void);
+  void parse_header_lite (CORBA::Environment &TAO_IN_ENV);
   // Parse the lightweight version of the GIOP request header and
   // store the result on this object.
 
@@ -191,10 +191,6 @@ private:
   // A pointer to the ORB Core for the context where the request was
   // created.
 
-  TAO_GIOP_Version version_;
-  // The version for the GIOP request, the reply must have the same
-  // one.
-
   TAO_GIOP_ServiceContextList service_info_;
   // The service context for the request (CORBA Reference?)
 
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index bde9b999deb..f3d52cdfe6c 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -31,17 +31,21 @@ ACE_RCSID(tao, IIOP_Acceptor, "$Id$")
 
 TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
   : TAO_Acceptor (TAO_IOP_TAG_INTERNET_IOP),
-    base_acceptor_ (),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0)
+    base_acceptor_ ()
 {
 }
 
-// TODO =
-//    2) For V1.[1,2] there are tagged components
-//    3) Create multiple profiles for wild carded endpoints (may be multiple
-//       interfaces over which we can receive requests.  Thus a profile
-//       must be made for each one.
+// @@ Fred&Ossama: Maybe not for the current round of changes, but
+//    shouldn't the acceptor know which version to create?
+//    And isn't this the right place to setup the tagged components of
+//    a v1.[12] profile?
+
+// @@ Fred&Ossama: We need to check this interface: a single
+//    TAO_Acceptor may be bound to multiple addresses (think of a
+//    multihomed machine with an acceptor listening on the wildcard
+//    address), hence the "Right Thing" seems to be that we pass an
+//    MProfile that is filled up by the TAO_Acceptor class.
+// @@ Right, I agree but for now we assume single endpoint.  fredk
 
 int
 TAO_IIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
@@ -60,24 +64,12 @@ TAO_IIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
                   TAO_IIOP_Profile (this->host_.c_str (),
                                     this->address_.get_port_number (),
                                     object_key,
-                                    this->address_,
-                                    this->version_,
-                                    this->orb_core_),
+                                    this->address_),
                   -1);
 
   if (mprofile.give_profile (pfile) == -1)
     return -1;
 
-  if (this->orb_core_->orb_params ()->std_profile_components () == 0)
-    return 0;
-
-  pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-  CONV_FRAME::CodeSetComponentInfo code_set_info;
-  code_set_info.ForCharData.native_code_set  = TAO_DEFAULT_CHAR_CODESET_ID;
-  code_set_info.ForWcharData.native_code_set = TAO_DEFAULT_WCHAR_CODESET_ID;
-  pfile->tagged_components ().set_code_sets (code_set_info);
-
   return 0;
 }
 
@@ -87,8 +79,15 @@ TAO_IIOP_Acceptor::is_collocated (const TAO_Profile* pfile)
   const TAO_IIOP_Profile *profile =
     ACE_dynamic_cast(const TAO_IIOP_Profile*, pfile);
 
-  // compare the port and sin_addr (numeric host address)
-  return profile->object_addr () == this->address_;
+  // @@ We should probably cache this value, but then again some
+  //    acceptors have multiple addresses.
+  // @@ Fred: any ideas on how to optimize that?
+  ACE_INET_Addr address;
+  if (this->base_acceptor_.acceptor ().get_local_addr (address) == -1)
+    return 0;
+
+  // @@ Ossama: can you verify that this operator does the right thing?
+  return profile->object_addr () == address;
 }
 
 ACE_Event_Handler *
@@ -105,13 +104,8 @@ TAO_IIOP_Acceptor::close (void)
 
 int
 TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                         int major,
-                         int minor,
                          ACE_CString &address)
 {
-  if (major >=0 && minor >= 0)
-    this->version_.set_version (ACE_static_cast (CORBA::Octet,major),
-                                ACE_static_cast (CORBA::Octet,minor));
   ACE_INET_Addr addr (address.c_str ());
 
   return this->open_i (orb_core, addr);
@@ -131,8 +125,6 @@ TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core)
 
   addr.set (u_short(0), buffer, 1);
 
-  this->host_ = buffer;
-
   return this->open_i (orb_core, addr);
 }
 
@@ -140,8 +132,6 @@ int
 TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
                            const ACE_INET_Addr& addr)
 {
-  this->orb_core_ = orb_core;
-
   if (this->base_acceptor_.open (orb_core, addr) == -1)
     {
       if (TAO_debug_level > 0)
@@ -191,7 +181,7 @@ TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
   if (TAO_debug_level > 5)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "\nTAO (%P|%t) IIOP_Acceptor::open_i - "
+                  "\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n",
                   "listening on: <%s:%u>\n",
                   this->host_.c_str (),
                   this->address_.get_port_number ()));
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 79f3d6b96e0..a35725defec 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -44,10 +44,7 @@ public:
   TAO_IIOP_Acceptor (void);
   // Create Acceptor object using addr.
 
-  virtual int open (TAO_ORB_Core *orb_core,
-                    int version_major,
-                    int version_minor,
-                    ACE_CString &address);
+  int open (TAO_ORB_Core *orb_core, ACE_CString &address);
   // initialize acceptor for this address.
 
   virtual int open_default (TAO_ORB_Core *orb_core);
@@ -93,12 +90,6 @@ private:
   //    endpoint. For example it the IP address is INADDR_ANY
   //    (0.0.0.0) then there will be possibly a different hostname for
   //    each interface.
-
-  TAO_GIOP_Version version_;
-  // The GIOP version for this endpoint
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp
index 3c4173641f1..52b7b6e8f83 100644
--- a/TAO/tao/IIOP_Connect.cpp
+++ b/TAO/tao/IIOP_Connect.cpp
@@ -19,6 +19,9 @@ ACE_RCSID(tao, Connect, "$Id$")
 
   static const char *TAO_Connect_Timeprobe_Description[] =
 {
+  "Server_Connection_Handler::send_response - start",
+  "Server_Connection_Handler::send_response - end",
+
   "Server_Connection_Handler::handle_input - start",
   "Server_Connection_Handler::handle_input - end",
 
@@ -36,7 +39,10 @@ ACE_RCSID(tao, Connect, "$Id$")
 enum
 {
   // Timeprobe description table start key
-  TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START = 300,
+  TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START = 300,
+  TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_END,
+
+  TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START,
   TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END,
 
   TAO_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START,
@@ -66,12 +72,11 @@ 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),
     orb_core_ (0),
-    tss_resources_ (0)
+    tss_resources_ (0),
+    input_ (ACE_CDR::DEFAULT_BUFSIZE)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -84,7 +89,10 @@ 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),
     orb_core_ (orb_core),
-    tss_resources_ (orb_core->get_tss_resources ())
+    tss_resources_ (TAO_ORB_CORE_TSS_RESOURCES::instance ()),
+    input_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
+            TAO_ENCAP_BYTE_ORDER,
+            orb_core)
 {
   transport_ = new TAO_IIOP_Server_Transport (this,
                                               this->orb_core_);
@@ -230,12 +238,66 @@ TAO_IIOP_Server_Connection_Handler::svc (void)
   return result;
 }
 
+// Handle processing of the request residing in <input>, setting
+// <response_required> to zero if the request is for a oneway or
+// non-zero if for a two-way and <output> to any necessary response
+// (including errors).  In case of errors, -1 is returned and
+// additional information carried in <TAO_IN_ENV>.
+// The request ID is needed by handle_input. It is passed back
+// as reference.
+
+int
+TAO_IIOP_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
+                                                    TAO_OutputCDR &output,
+                                                    CORBA::Boolean &response_required,
+                                                    CORBA::ULong &request_id,
+                                                    CORBA::Environment &ACE_TRY_ENV)
+{
+  TAO_GIOP::process_server_request (this->transport (),
+                                    this->orb_core_,
+                                    input,
+                                    output,
+                                    response_required,
+                                    request_id,
+                                    ACE_TRY_ENV);
+  return 0;
+}
+
+int
+TAO_IIOP_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
+                                                   TAO_OutputCDR &output,
+                                                   CORBA::Boolean &response_required,
+                                                   CORBA::ULong &request_id,
+                                                   CORBA::Environment &ACE_TRY_ENV)
+{
+  TAO_GIOP::process_server_locate (this->transport (),
+                                   this->orb_core_,
+                                   input,
+                                   output,
+                                   response_required,
+                                   request_id,
+                                   ACE_TRY_ENV);
+  return 0;
+}
+
+void
+TAO_IIOP_Server_Connection_Handler::send_response (TAO_OutputCDR &output)
+{
+  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
+
+  TAO_GIOP::send_message (this->transport_,
+                          output,
+                          this->orb_core_);
+}
+
 int
 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->message_header_,
+                                       this->current_offset_,
+                                       this->input_);
 
   if (result == -1 && TAO_debug_level > 0)
     {
@@ -243,16 +305,17 @@ TAO_IIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
                   "TAO (%P|%t) - %p\n",
                   "IIOP_Server_CH::handle_input, handle_input"));
     }
-
-  if (result == 0 || result == -1)
-    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;
+  if (result == 1)
+    {
+      TAO_GIOP_MessageHeader header_copy = this->message_header_;
+      this->message_header_.message_size = 0;
+      TAO_GIOP::process_server_message (this->transport (),
+                                        this->orb_core_,
+                                        this->input_,
+                                        header_copy);
+      result = 0;
+    }
+  return result;
 }
 
 // ****************************************************************
diff --git a/TAO/tao/IIOP_Connect.h b/TAO/tao/IIOP_Connect.h
index c86d6e1fd97..5e06f08ec76 100644
--- a/TAO/tao/IIOP_Connect.h
+++ b/TAO/tao/IIOP_Connect.h
@@ -126,10 +126,37 @@ public:
 
   // = Template Methods Called by <handle_input>
 
+  virtual int handle_message (TAO_InputCDR &msg,
+                              TAO_OutputCDR &response,
+                              CORBA::Boolean &response_required,
+                              CORBA::ULong &request_id,
+                              CORBA_Environment &TAO_IN_ENV =
+                                  TAO_default_environment ());
+  // Handle processing of the request residing in <msg>, setting
+  // <response_required> to zero if the request is for a oneway or
+  // non-zero if for a two-way and <response> to any necessary
+  // response (including errors).  In case of errors, -1 is returned
+  // and additional information carried in <env>.
+
   TAO_Transport *transport (void);
 
 protected:
 
+  virtual int handle_locate (TAO_InputCDR &msg,
+                             TAO_OutputCDR &response,
+                             CORBA::Boolean &response_required,
+                             CORBA::ULong &request_id,
+                             CORBA_Environment &TAO_IN_ENV =
+                                 TAO_default_environment ());
+  // Handle processing of the location request residing in <msg>,
+  // setting <response_required> to one if no errors are encountered.
+  // The LocateRequestReply is placed into <response>.  In case of
+  // errors, -1 is returned and additional information carried in
+  // <TAO_IN_ENV>.
+
+  virtual void send_response (TAO_OutputCDR &response);
+  // Send <response> to the client on the other end.
+
   // = Event Handler overloads
 
   virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
@@ -149,6 +176,12 @@ protected:
 
   TAO_ORB_Core_TSS_Resources *tss_resources_;
   // Cached tss resources of the ORB that activated this object.
+
+  TAO_GIOP_MessageHeader message_header_;
+  CORBA::ULong current_offset_;
+  TAO_InputCDR input_;
+  // This keep the state of the current message, to enable
+  // non-blocking reads.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index b2d4327f055..867af250af4 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -57,31 +57,28 @@ typedef ACE_Cached_Connect_Strategy<TAO_IIOP_Client_Connection_Handler,
 
 TAO_IIOP_Connector::TAO_IIOP_Connector (void)
   : TAO_Connector (TAO_IOP_TAG_INTERNET_IOP),
-    base_connector_ (),
-    orb_core_ (0)
+    base_connector_ ()
 {
 }
 
 int
 TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
-  this->orb_core_ = orb_core;
-
   TAO_Cached_Connector_Lock *connector_lock = 0;
   ACE_NEW_RETURN (connector_lock,
-                  TAO_Cached_Connector_Lock (this->orb_core_),
+                  TAO_Cached_Connector_Lock (orb_core),
                   -1);
 
   TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy =
     new TAO_CACHED_CONNECT_STRATEGY (
-        new TAO_IIOP_Connect_Creation_Strategy (this->orb_core_->thr_mgr (),
-                                                this->orb_core_),
+        new TAO_IIOP_Connect_Creation_Strategy (orb_core->thr_mgr (),
+                                                orb_core),
         0,
         0,
         connector_lock,
         1);
 
-  return this->base_connector_.open (this->orb_core_->reactor (),
+  return this->base_connector_.open (orb_core->reactor (),
                                      &this->null_creation_strategy_,
                                      cached_connect_strategy,
                                      &this->null_activation_strategy_);
@@ -129,16 +126,12 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile,
                                      oa) == -1)
     { // Give users a clue to the problem.
       if (TAO_orbdebug)
-        {
-          char buffer [MAXNAMELEN * 2];
-          profile->addr_to_string (buffer, (MAXNAMELEN * 2) - 1);
-          ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
-                      "%s failed (%p)\n",
-                      __FILE__,
-                      __LINE__,
-                      buffer,
-                      "errno"));
-        }
+        ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
+                    "%s failed (%p)\n",
+                    __FILE__,
+                    __LINE__,
+                    profile->addr_to_string (),
+                    "errno"));
 
       return -1;
     }
@@ -284,9 +277,7 @@ TAO_Profile*
 TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr)
 {
   TAO_Profile* pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_IIOP_Profile (this->orb_core_),
-                  0);
+  ACE_NEW_RETURN (pfile, TAO_IIOP_Profile, 0);
 
   int r = pfile->decode (cdr);
   if (r == -1)
@@ -312,9 +303,7 @@ TAO_IIOP_Connector::make_profile (const char *endpoint,
   //    //host:port/object_key
 
   ACE_NEW_RETURN (profile,
-                  TAO_IIOP_Profile (endpoint,
-                                    this->orb_core_,
-                                    ACE_TRY_ENV),
+                  TAO_IIOP_Profile (endpoint, ACE_TRY_ENV),
                   -1);
 
   return 0;  // Success
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 8560f106798..d5984b4a7e8 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -60,9 +60,7 @@ class TAO_Export TAO_IIOP_Connector : public TAO_Connector
   //   IIOP-specific Connector bridge for pluggable protocols.
   //
   // = DESCRIPTION
-  //   Concrete instance of the TAO_Connector class.  Responsible
-  //   for establishing a connection with a server and is called from the
-  //   Connector_Registory.
+  //   @@ Fred, please fill in here.
   //
 public:
   // = Initialization and termination methods.
@@ -100,9 +98,6 @@ private:
 
   TAO_IIOP_BASE_CONNECTOR  base_connector_;
   // The connector initiating connection requests for IIOP.
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
 };
 
 #endif  /* TAO_IIOP_CONNECTOR_H */
diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
index 636cabeeb12..5dcc786ee31 100644
--- a/TAO/tao/IIOP_Factory.cpp
+++ b/TAO/tao/IIOP_Factory.cpp
@@ -9,8 +9,6 @@ ACE_RCSID(tao, IIOP_Factory, "$Id$")
 
 
 TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void)
-  :  major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
 {
 }
 
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index 0cdbe9ee656..07f1f60a5d9 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -25,6 +25,7 @@
 class TAO_Acceptor;
 class TAO_Connector;
 
+
 class TAO_Export TAO_IIOP_Protocol_Factory : public TAO_Protocol_Factory
 {
 public:
@@ -45,12 +46,6 @@ public:
 
   virtual TAO_Connector *make_connector  (void);
   // create a connector
-
-private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_IIOP_Protocol_Factory)
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index dcc239e7a58..270ac9e02ad 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -1,8 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
-
 #include "tao/IIOP_Profile.h"
 #include "tao/IIOP_Connect.h"
 #include "tao/GIOP.h"
@@ -23,97 +21,234 @@ static const char *prefix_ = "iiop:";
 
 const char TAO_IIOP_Profile::object_key_delimiter = '/';
 
-TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
-                                    const TAO_GIOP_Version &version,
-                                    TAO_ORB_Core *orb_core)
+TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
+                                    const char *object_key)
+  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
+    host_ (0),
+    port_ (0),
+    body_ (),
+    version_ (DEF_IIOP_MAJOR, DEF_IIOP_MINOR),
+    object_key_ (),
+    object_addr_ (addr),
+    hint_ (0)
+{
+  this->set (addr);
+  int l = ACE_OS::strlen (object_key);
+  this->object_key_.length (l);
+
+  for (int i = 0; i < l; ++i)
+    this->object_key_[i] = object_key[i];
+
+  this->create_body ();
+}
+
+TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
+                                    const TAO_ObjectKey& object_key)
   : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
     host_ (0),
     port_ (0),
+    body_ (),
+    version_ (DEF_IIOP_MAJOR, DEF_IIOP_MINOR),
+    object_key_ (object_key),
+    object_addr_ (addr),
+    hint_ (0)
+{
+  this->set (addr);
+  this->create_body ();
+}
+
+TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
+                                    const TAO_IOP_Version& version,
+                                    const char *object_key)
+  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
+    host_ (0),
+    port_ (0),
+    body_ (),
+    version_ (version),
+    object_key_ (),
+    object_addr_ (addr),
+    hint_ (0)
+{
+  this->set (addr);
+  int l = ACE_OS::strlen (object_key);
+  this->object_key_.length (l);
+
+  for (int i = 0; i < l; ++i)
+    this->object_key_[i] = object_key[i];
+
+  this->create_body ();
+}
+
+TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
+                                    const TAO_IOP_Version& version,
+                                    const TAO_ObjectKey& object_key)
+  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
+    host_ (0),
+    port_ (0),
+    body_ (),
     version_ (version),
     object_key_ (object_key),
     object_addr_ (addr),
-    hint_ (0),
-    orb_core_ (orb_core)
+    hint_ (0)
 {
   this->set (addr);
+  this->create_body ();
 }
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
                                     CORBA::UShort port,
-                                    const TAO_ObjectKey &object_key,
-                                    const ACE_INET_Addr &addr,
-                                    const TAO_GIOP_Version &version,
-                                    TAO_ORB_Core *orb_core)
+                                    const TAO_ObjectKey& object_key)
   : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
     host_ (0),
     port_ (port),
-    version_ (version),
+    body_ (),
+    version_ (DEF_IIOP_MAJOR, DEF_IIOP_MINOR),
+    object_key_ (object_key),
+    object_addr_ (port, host),
+    hint_ (0)
+{
+
+  if (host)
+  {
+    ACE_NEW (this->host_,
+             char[ACE_OS::strlen (host) + 1]);
+    ACE_OS::strcpy (this->host_, host);
+  }
+
+  this->create_body ();
+}
+
+TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
+                                    CORBA::UShort port,
+                                    const TAO_ObjectKey& object_key,
+                                    const ACE_INET_Addr& addr)
+  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
+    host_ (0),
+    port_ (port),
+    body_ (),
+    version_ (DEF_IIOP_MAJOR, DEF_IIOP_MINOR),
     object_key_ (object_key),
     object_addr_ (addr),
-    hint_ (0),
-    orb_core_ (orb_core)
+    hint_ (0)
 {
+
   if (host)
-    {
-      ACE_NEW (this->host_,
-               char[ACE_OS::strlen (host) + 1]);
-      ACE_OS::strcpy (this->host_, host);
-    }
+  {
+    ACE_NEW (this->host_,
+             char[ACE_OS::strlen (host) + 1]);
+    ACE_OS::strcpy (this->host_, host);
+  }
+
+  this->create_body ();
+}
+
+TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
+                                    CORBA::UShort port,
+                                    const TAO_IOP_Version& version,
+                                    const TAO_ObjectKey& object_key)
+  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
+    host_ (0),
+    port_ (port),
+    body_ (),
+    version_ (DEF_IIOP_MAJOR, DEF_IIOP_MINOR),
+    object_key_ (object_key),
+    object_addr_ (port, host),
+    hint_ (0)
+{
+  ACE_UNUSED_ARG (version);
+
+  ACE_NEW (this->host_,
+           char[ACE_OS::strlen (host) + 1]);
+  ACE_OS::strcpy (this->host_, host);
+
+  this->create_body ();
+}
+
+TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile *pfile)
+  : TAO_Profile (pfile->tag ()),
+    host_(0),
+    port_(pfile->port_),
+    body_(pfile->body_),
+    version_(pfile->version_),
+    object_key_(pfile->object_key_),
+    object_addr_(pfile->object_addr_),
+    hint_(0)
+{
+
+  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 TAO_IIOP_Profile &pfile)
   : TAO_Profile (pfile.tag ()),
     host_(0),
     port_(pfile.port_),
+    body_(pfile.body_),
     version_(pfile.version_),
     object_key_(pfile.object_key_),
     object_addr_(pfile.object_addr_),
-    hint_(0),
-    orb_core_ (pfile.orb_core_)
+    hint_(0)
 {
+
   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 TAO_IOP_Version &version)
+  : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
+    host_ (0),
+    port_ (0),
+    body_ (),
+    version_ (version),
+    object_key_ (),
+    object_addr_ (),
+    hint_ (0)
+{
 }
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const char *string,
-                                    TAO_ORB_Core *orb_core,
                                     CORBA::Environment &env)
   : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
     host_ (0),
     port_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
+    body_ (),
+    version_ (DEF_IIOP_MAJOR, DEF_IIOP_MINOR),
     object_key_ (),
     object_addr_ (),
-    hint_ (0),
-    orb_core_ (orb_core)
+    hint_ (0)
 {
   parse_string (string, env);
 }
 
-TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core)
+TAO_IIOP_Profile::TAO_IIOP_Profile (void)
   : TAO_Profile (TAO_IOP_TAG_INTERNET_IOP),
     host_ (0),
     port_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
+    body_ (),
+    version_ (DEF_IIOP_MAJOR, DEF_IIOP_MINOR),
     object_key_ (),
     object_addr_ (),
-    hint_ (0),
-    orb_core_ (orb_core)
+    hint_ (0)
 {
 }
 
 int
-TAO_IIOP_Profile::set (const ACE_INET_Addr &addr)
+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 ())
+  // @@ We really should be passing in TAO_ORB_Core as a parameter,
+  // instead of using the ORB_Core singleton.
+  if (TAO_ORB_Core_instance ()->orb_params ()->use_dotted_decimal_addresses ())
     {
       temphost2 = addr.get_host_addr ();
       if (temphost2 == 0)
@@ -161,9 +296,9 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr)
   // 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
+        && this->version_.major == TAO_IIOP_Profile::DEF_IIOP_MAJOR
         && cdr.read_octet (this->version_.minor)
-        && this->version_.minor <= TAO_DEF_GIOP_MINOR))
+        && this->version_.minor <= TAO_IIOP_Profile::DEF_IIOP_MINOR))
   {
     if (TAO_debug_level > 0)
       {
@@ -200,11 +335,6 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr)
   if ((cdr >> this->object_key_) == 0)
     return -1;
 
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    if (this->tagged_components_.decode (cdr) == 0)
-      return -1;
-
   if (cdr.length () != 0 && TAO_debug_level)
     {
       // If there is extra data in the profile we are supposed to
@@ -214,7 +344,6 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr)
                   cdr.length (),
                   encap_len));
     }
-
   if (cdr.good_bit ())
     return 1;
 
@@ -245,8 +374,8 @@ TAO_IIOP_Profile::parse_string (const char *string,
       // Skip over the "N.n@"
     }
 
-  if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
-      this->version_.minor >  TAO_DEF_GIOP_MINOR)
+  if (this->version_.major != TAO_IIOP_Profile::DEF_IIOP_MAJOR ||
+      this->version_.minor >  TAO_IIOP_Profile::DEF_IIOP_MINOR)
     {
       ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
     }
@@ -308,6 +437,41 @@ TAO_IIOP_Profile::parse_string (const char *string,
   return 1;
 }
 
+//  TAO_InputCDR cdr (body.get_buffer (), body.length (), body[0]);
+//
+// @@
+//  CORBA::Boolean byte_order;
+//  cdr >> CORBA::Any::to_boolean (byte_order);
+//  cdr >> this->version_.major;
+//  cdr >> this->version_.minor;
+//  cdr >> this->host_ ();
+//  cdr >> this->port_;
+//  cdr >> this->object_key_;
+//  this->object_addr_.set(this->port_, this->host_);
+// }
+
+void
+TAO_IIOP_Profile::create_body (void)
+{
+}
+// @@
+//  TAO_OutputCDR cdr;
+//   cdr << TAO_ENCAP_BYTE_ORDER;
+//   cdr << this->version_.major;
+//   cdr << this->version_.minor;
+//   cdr << this->host_;
+//   cdr << this->port_;
+//   cdr << this->object_key_;
+//
+//   // Create a copy by making a temporary TAO_opaque object.
+//   // @@ TODO the CDR stream may contain several fragments, need to
+//   // merge them...
+//   this->body_ = TAO_opaque (cdr.length (), // length
+//                             cdr.length (), // maximum
+//                             cdr.buffer (), // buffer
+//                             0);            // not own
+// }
+
 CORBA::Boolean
 TAO_IIOP_Profile::is_equivalent (TAO_Profile *other_profile,
                                  CORBA::Environment &env)
@@ -352,19 +516,13 @@ TAO_IIOP_Profile::hash (CORBA::ULong max,
   return hashval % max;
 }
 
-int
-TAO_IIOP_Profile::addr_to_string(char *buffer, size_t length)
+char *
+TAO_IIOP_Profile::addr_to_string(void)
 {
-  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",
+  static char s[MAXHOSTNAMELEN + MAXHOSTNAMELEN];
+  ACE_OS::sprintf (s, "%s:%d",
                    this->host_, port_);
-  return 0;
+  return s;
 }
 
 const char *
@@ -475,37 +633,41 @@ TAO_IIOP_Profile::encode (TAO_OutputCDR &stream) const
   // UNSIGNED LONG, protocol tag
   stream.write_ulong (this->tag ());
 
-  // Create the encapsulation....
-  TAO_OutputCDR encap (ACE_CDR::DEFAULT_BUFSIZE,
-                       TAO_ENCAP_BYTE_ORDER,
-                       this->orb_core_->output_cdr_buffer_allocator (),
-                       this->orb_core_->output_cdr_dblock_allocator (),
-                       this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                       this->orb_core_->to_iso8859 (),
-                       this->orb_core_->to_unicode ());
-
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // The GIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
+  // UNSIGNED LONG, number of succeeding bytes in the
+  // encapsulation.  We don't actually need to make the
+  // encapsulation, as nothing needs stronger alignment than
+  // this longword; it guarantees the rest is aligned for us.
+
+  CORBA::ULong hostlen = ACE_OS::strlen ((char *) this->host_);
+  CORBA::ULong encap_len =
+    1                              // byte order
+    + 1                            // version major
+    + 1                            // version minor
+    + 1                            // pad byte
+    + 4                            // sizeof (strlen)
+    + hostlen + 1                  // strlen + null
+    + (~hostlen & 01)              // optional pad byte
+    + 2                            // port
+    + ( hostlen & 02)              // optional pad short
+    + 4                            // sizeof (key length)
+    + this->object_key_.length (); // key length.
+  stream.write_ulong (encap_len);
+
+  // CHAR describing byte order, starting the encapsulation
+  stream.write_octet (TAO_ENCAP_BYTE_ORDER);
+
+  // IIOP::TAO_IOP_Version, two characters (version 1.0) padding
+  stream.write_char (this->version_.major);
+  stream.write_char (this->version_.minor);
 
   // STRING hostname from profile
-  encap.write_string (this->host_);
+  stream.write_string (this->host_);
 
   // UNSIGNED SHORT port number
-  encap.write_ushort (this->port_);
+  stream.write_ushort (this->port_);
 
   // OCTET SEQUENCE for object key
-  encap << this->object_key_;
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    this->tagged_components_.encode (encap);
-
-  // write the encapsulation as an octet sequence...
-  stream << CORBA::ULong (encap.total_length ());
-  stream.write_octet_array_mb (encap.begin ());
+  stream << this->object_key_;
 
   return 1;
 }
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index eecf974bc38..071df9985b3 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -20,13 +20,10 @@
 #ifndef TAO_IIOP_PROFILE_H
 #define TAO_IIOP_PROFILE_H
 
-#include "tao/Pluggable.h"
-#include "tao/Object_KeyC.h"
-#include "tao/GIOP.h"
-#include "tao/Tagged_Components.h"
-
 #include "ace/Synch.h"
 #include "ace/INET_Addr.h"
+#include "tao/Pluggable.h"
+#include "tao/Object_KeyC.h"
 
 class TAO_IIOP_Client_Connection_Handler;
 
@@ -41,6 +38,13 @@ class TAO_Export TAO_IIOP_Profile : public TAO_Profile
   //   This class defines the IIOP profile as specified in the CORBA
   //   specification.
 public:
+  // = Currently, TAO supports IIOP 1.0.
+  enum
+    {
+      DEF_IIOP_MAJOR = 1,
+      DEF_IIOP_MINOR = 0
+    };
+
   static const char object_key_delimiter;
   // The object key delimiter that IIOP uses or expects.
 
@@ -48,33 +52,60 @@ public:
   // Return the char string prefix.
 
   TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_ObjectKey &object_key,
-                    const TAO_GIOP_Version &version,
-                    TAO_ORB_Core *orb_core);
+                    const char *object_key);
+  // Profile constructor, the port and host fileds are derived from
+  // addr.  This is not an efficient creator since a call to
+  // get_host_XX is required.
+
+  TAO_IIOP_Profile (const ACE_INET_Addr &addr,
+                    const TAO_ObjectKey &object_key);
   // Profile constructor, same as above except the object_key has
   // already been marshaled.
 
+  TAO_IIOP_Profile (const ACE_INET_Addr &addr,
+                    const TAO_IOP_Version &version,
+                    const char *object_key);
+  //  Profile constructor, explicitly define the protocol version.
+
+  TAO_IIOP_Profile (const ACE_INET_Addr &addr,
+                    const TAO_IOP_Version &version,
+                    const TAO_ObjectKey &object_key);
+  //  Profile constructor, explicitly define the protocol version.
+
   TAO_IIOP_Profile (const char *host,
                     CORBA::UShort port,
                     const TAO_ObjectKey &object_key,
-                    const ACE_INET_Addr &addr,
-                    const TAO_GIOP_Version &version,
-                    TAO_ORB_Core *orb_core);
+                    const ACE_INET_Addr &addr);
   //  Profile constructor, this is the most efficient since it
   // doesn't require any address resolution processing.
 
+  TAO_IIOP_Profile (const char *host,
+                    CORBA::UShort port,
+                    const TAO_ObjectKey &object_key);
+  // Profile constructor, the port and host fileds are specified
+  // but addr must be created rfom a call to get_host_byname which
+  // is expensive since it may go to DNS.
+
+  TAO_IIOP_Profile (const char *host,
+                    CORBA::UShort port,
+                    const TAO_IOP_Version &version,
+                    const TAO_ObjectKey &object_key);
+  //  Profile constructor, explicitly define the protocol version
+
   TAO_IIOP_Profile (const char *string,
-                    TAO_ORB_Core *orb_core,
                     CORBA::Environment &env);
   // Create object using a string ior.
 
+  TAO_IIOP_Profile (const TAO_IIOP_Profile *pfile);
+  // Profile copy constructor
+
   TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile);
   // Profile copy constructor
 
-  TAO_IIOP_Profile &operator= (const TAO_IIOP_Profile &src);
-  // Copy operator.
+  TAO_IIOP_Profile (const TAO_IOP_Version &version);
+  // Profile constructor, explicitly define the version.
 
-  TAO_IIOP_Profile (TAO_ORB_Core *orb_core);
+  TAO_IIOP_Profile (void);
   // Profile constructor, default.
 
   ~TAO_IIOP_Profile (void);
@@ -88,6 +119,9 @@ public:
   // Return a string representation for this profile.
   // client must deallocate memory.
 
+  const TAO_opaque& body (void) const;
+  // Create IIOP_Profile Object from marshalled data.
+
   int decode (TAO_InputCDR& cdr);
   // Initialize this object using the given CDR octet string.
 
@@ -100,7 +134,7 @@ public:
   TAO_ObjectKey &object_key (TAO_ObjectKey& objkey);
   // @@ deprecated. set the Object Key.
 
-  TAO_ObjectKey *_key (void) const;
+  TAO_ObjectKey *_key (CORBA::Environment &env) const;
   //  Return a pointer to the Object Key.
 
   CORBA::Boolean is_equivalent (TAO_Profile *other_profile,
@@ -113,7 +147,7 @@ public:
                      CORBA::Environment &env);
   // Return a hash value for this object.
 
-  int addr_to_string (char *buffer, size_t length);
+  char *addr_to_string (void);
   // Return a string representation for the address.
 
   const ACE_INET_Addr &object_addr (void) const;
@@ -133,25 +167,33 @@ public:
   CORBA::UShort port (CORBA::UShort p);
   // Set the port number.
 
-  const TAO_GIOP_Version& version (void) const;
+  const TAO_IOP_Version *version (void);
   // Return a pointer to this profile's version.  This object
   // maintains ownership.
 
+  const TAO_IOP_Version *version (TAO_IOP_Version *v);
+  // First set the version then return a pointer to it.  This object
+  // maintains ownership.
+
   TAO_IIOP_Client_Connection_Handler *&hint (void);
   //  This is a hint for which connection handler to use.
 
   void reset_hint (void);
   //  Reset the hint's value.
 
-  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
+  TAO_Profile *_nil (void);
+  // Return a null object pointer.
+
+  TAO_IIOP_Profile &operator= (const TAO_IIOP_Profile &src);
+  // Copy operator.
 
 private:
   int set (const ACE_INET_Addr &addr);
   // helper method to set the INET_Addr.
 
+  void create_body (void);
+  // Does the work for <add_profile>.
+
 private:
 
   char *host_;
@@ -160,7 +202,10 @@ private:
   CORBA::UShort port_;
   // TCP port number
 
-  TAO_GIOP_Version version_;
+  TAO_opaque body_;
+  // Marshaled profile (CDR).
+
+  TAO_IOP_Version version_;
   // IIOP version number.
 
   TAO_ObjectKey object_key_;
@@ -173,12 +218,6 @@ private:
   TAO_IIOP_Client_Connection_Handler *hint_;
   // Pointer to a connection handler which we successfully used
   // already.
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
-
-  TAO_Tagged_Components tagged_components_;
-  // The tagged components
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/IIOP_Profile.i b/TAO/tao/IIOP_Profile.i
index 0b1acee39c4..21caded72a6 100644
--- a/TAO/tao/IIOP_Profile.i
+++ b/TAO/tao/IIOP_Profile.i
@@ -15,11 +15,17 @@ TAO_IIOP_Profile::object_key (TAO_ObjectKey& objkey)
 }
 
 ACE_INLINE TAO_ObjectKey *
-TAO_IIOP_Profile::_key (void) const
+TAO_IIOP_Profile::_key (CORBA::Environment &) const
 {
   return new TAO_ObjectKey (this->object_key_);
 }
 
+ACE_INLINE const TAO_opaque&
+TAO_IIOP_Profile::body (void) const
+{
+  return this->body_;
+}
+
 ACE_INLINE const ACE_INET_Addr&
 TAO_IIOP_Profile::object_addr (void) const
 {
@@ -44,26 +50,27 @@ TAO_IIOP_Profile::port (CORBA::UShort p)
   return this->port_ = p;
 }
 
-ACE_INLINE const TAO_GIOP_Version &
-TAO_IIOP_Profile::version (void) const
+ACE_INLINE const TAO_IOP_Version *
+TAO_IIOP_Profile::version (void)
 {
-  return this->version_;
+  return &this->version_;
 }
 
-ACE_INLINE TAO_IIOP_Client_Connection_Handler *&
-TAO_IIOP_Profile::hint(void)
+ACE_INLINE const TAO_IOP_Version *
+TAO_IIOP_Profile::version (TAO_IOP_Version *v)
 {
-  return this->hint_;
+  this->version_ = *v;
+  return &this->version_;
 }
 
-ACE_INLINE const TAO_Tagged_Components&
-TAO_IIOP_Profile::tagged_components (void) const
+ACE_INLINE TAO_IIOP_Client_Connection_Handler *&
+TAO_IIOP_Profile::hint(void)
 {
-  return this->tagged_components_;
+  return this->hint_;
 }
 
-ACE_INLINE TAO_Tagged_Components&
-TAO_IIOP_Profile::tagged_components (void)
+ACE_INLINE TAO_Profile *
+TAO_IIOP_Profile::_nil (void)
 {
-  return this->tagged_components_;
+  return (TAO_IIOP_Profile *)0;
 }
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 45e35dac4e4..bcd5b929ddd 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -5,7 +5,6 @@
 
 #include "tao/IIOP_Transport.h"
 #include "tao/IIOP_Connect.h"
-#include "tao/IIOP_Profile.h"
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
 #include "tao/Transport_Mux_Strategy.h"
@@ -59,47 +58,14 @@ TAO_IIOP_Transport::~TAO_IIOP_Transport (void)
 {
 }
 
-TAO_IIOP_Handler_Base *&
-TAO_IIOP_Transport::handler (void)
-{
-  return this->handler_;
-}
-
-int
-TAO_IIOP_Transport::idle (void)
-{
-  return this->handler_->idle();
-}
-
-void
-TAO_IIOP_Transport::close_connection (void)
-{
-  this->handler_->handle_close ();
-}
-
-ACE_HANDLE
-TAO_IIOP_Transport::handle (void)
-{
-  return this->handler_->get_handle ();
-}
-
-// ****************************************************************
-
 TAO_IIOP_Server_Transport::
     TAO_IIOP_Server_Transport (TAO_IIOP_Server_Connection_Handler *handler,
                                TAO_ORB_Core* orb_core)
   : TAO_IIOP_Transport (handler, orb_core),
-    server_handler_ (handler),
-    message_state_ (orb_core)
+    server_handler_ (handler)
 {
 }
 
-TAO_IIOP_Server_Transport::~TAO_IIOP_Server_Transport (void)
-{
-}
-
-// ****************************************************************
-
 TAO_IIOP_Client_Transport::
     TAO_IIOP_Client_Transport (TAO_IIOP_Client_Connection_Handler *handler,
                                TAO_ORB_Core *orb_core)
@@ -109,6 +75,10 @@ TAO_IIOP_Client_Transport::
 {
 }
 
+TAO_IIOP_Server_Transport::~TAO_IIOP_Server_Transport (void)
+{
+}
+
 TAO_IIOP_Client_Transport::~TAO_IIOP_Client_Transport (void)
 {
 }
@@ -119,84 +89,34 @@ TAO_IIOP_Client_Transport::client_handler (void)
   return this->client_handler_;
 }
 
-void
-TAO_IIOP_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_IIOP_Server_Connection_Handler *
+TAO_IIOP_Server_Transport::server_handler (void)
 {
-  const TAO_IIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_IIOP_Profile*,pfile);
-
-  // Obtain object key.
-  const TAO_ObjectKey& key = profile->object_key ();
+  return this->server_handler_;
+}
 
-  // @@ This should be implemented in the transport object, which
-  //    would query the profile to obtain the version...
-  if (TAO_GIOP::start_message (profile->version (),
-                               TAO_GIOP::Request,
-                               output,
-                               orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
+TAO_IIOP_Handler_Base *&
+TAO_IIOP_Transport::handler (void)
+{
+  return this->handler_;
+}
 
-  // Then fill in the rest of the RequestHeader
-  //
-  // The first element of header is service context list;
-  // transactional context would be acquired here using the
-  // transaction service APIs.  Other kinds of context are as yet
-  // undefined.
-  //
-  // Last element of request header is the principal; no portable way
-  // to get it, we just pass empty principal (convention: indicates
-  // "anybody").  Steps upward in security include passing an
-  // unverified user ID, and then verifying the message (i.e. a dummy
-  // service context entry is set up to hold a digital signature for
-  // this message, then patched shortly before it's sent).
-  static CORBA::Principal_ptr principal = 0;
-
-  if (TAO_GIOP::write_request_header (request_id,
-                                      is_roundtrip,
-                                      key,
-                                      opname,
-                                      principal,
-                                      output,
-                                      orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
+int
+TAO_IIOP_Transport::idle (void)
+{
+  return this->handler_->idle();
 }
 
 void
-TAO_IIOP_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_IIOP_Transport::close_connection (void)
 {
-  const TAO_IIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_IIOP_Profile*,pfile);
-
-  // Obtain object key.
-  const TAO_ObjectKey& key = profile->object_key ();
-
-  // @@ This should be implemented in the transport object, which
-  //    would query the profile to obtain the version...
-  if (TAO_GIOP::start_message (profile->version (),
-                               TAO_GIOP::Request,
-                               output,
-                               orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
-
+  this->handler_->handle_close ();
+}
 
-  if (TAO_GIOP::write_locate_request_header (this->request_id (),
-                                             key,
-                                             output) != 0)
-    ACE_THROW (CORBA::MARSHAL ());
+ACE_HANDLE
+TAO_IIOP_Transport::handle (void)
+{
+  return this->handler_->get_handle ();
 }
 
 int
@@ -247,12 +167,13 @@ TAO_IIOP_Client_Transport::handle_client_input (int block)
   //    removed.
   //    Do I make any sense?
 
-  TAO_GIOP_Message_State* message_state =
-    this->tms_->get_message_state ();
+  TAO_InputCDR* cdr = this->tms_->get_cdr_stream ();
 
   int result = TAO_GIOP::handle_input (this,
                                        this->orb_core_,
-                                       *message_state);
+                                       this->message_header_,
+                                       this->current_offset_,
+                                       *cdr);
   if (result == -1)
     {
       if (TAO_debug_level > 0)
@@ -266,13 +187,17 @@ TAO_IIOP_Client_Transport::handle_client_input (int block)
 
   // OK, the complete message is here...
 
+  TAO_GIOP_MessageHeader header_copy = this->message_header_;
+  this->message_header_.message_size = 0;
+
   TAO_GIOP_ServiceContextList reply_ctx;
   CORBA::ULong request_id;
   CORBA::ULong reply_status;
 
   result = TAO_GIOP::parse_reply (this,
                                   this->orb_core_,
-                                  *message_state,
+                                  *cdr,
+                                  header_copy,
                                   reply_ctx,
                                   request_id,
                                   reply_status);
@@ -282,28 +207,26 @@ TAO_IIOP_Client_Transport::handle_client_input (int block)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) - %p\n",
                     "IIOP_Transport::handle_client_input, parse reply"));
-      message_state->reset ();
       return -1;
     }
 
   if (this->tms_->dispatch_reply (request_id,
                                   reply_status,
-                                  message_state->giop_version,
+                                  header_copy.giop_version,
                                   reply_ctx,
-                                  message_state) != 0)
+                                  cdr) != 0)
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
                     "TAO (%P|%t) : IIOP_Client_Transport::"
                     "handle_client_input - "
                     "dispatch reply failed\n"));
-      message_state->reset ();
       return -1;
     }
 
   // 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);
+  this->tms_->destroy_cdr_stream (cdr);
 
   // Return something to indicate the reply is received.
   return 1;
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 574b4544858..c07c71afe8b 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -126,24 +126,6 @@ public:
   TAO_IIOP_Client_Connection_Handler *client_handler (void);
   // return a pointer to the client's connection handler.
 
-  virtual void start_request (TAO_ORB_Core *orb_core,
-                              const TAO_Profile *profile,
-                              const char* opname,
-                              CORBA::ULong request_id,
-                              CORBA::Boolean is_twoway,
-                              TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Fill into <output> the right headers to make a request.
-
-  virtual void start_locate (TAO_ORB_Core *orb_core,
-                             const TAO_Profile *profile,
-                             CORBA::ULong request_id,
-                             TAO_OutputCDR &output,
-                             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);
@@ -169,6 +151,11 @@ protected:
 private:
   TAO_IIOP_Client_Connection_Handler *client_handler_;
   // pointer to the corresponding client side connection handler.
+
+  TAO_GIOP_MessageHeader message_header_;
+  CORBA::ULong current_offset_;
+  // This keep the state of the current message, to enable
+  // non-blocking reads.
 };
 
 // ****************************************************************
@@ -192,12 +179,12 @@ public:
   ~TAO_IIOP_Server_Transport (void);
   // Default destructor
 
+  TAO_IIOP_Server_Connection_Handler *server_handler (void);
+  //  Return a pointer to the underlying connection handler.
+
+private:
   TAO_IIOP_Server_Connection_Handler *server_handler_;
   // Pointer to the corresponding connection handler.
-
-  TAO_GIOP_Message_State message_state_;
-  // This keep the state of the current message, to enable
-  // non-blocking reads, fragment reassembly, etc.
 };
 
 #endif  /* TAO_IIOP_TRANSPORT_H */
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
deleted file mode 100644
index e6074797507..00000000000
--- a/TAO/tao/IOPC.cpp
+++ /dev/null
@@ -1,1223 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPC.cpp
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "tao/IOPC.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/IOPC.i"
-#endif /* !defined INLINE */
-
-static const CORBA::Long _oc_IOP_ProfileId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-  10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-  CORBA::tk_ulong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId (CORBA::tk_alias, sizeof (_oc_IOP_ProfileId), (char *) &_oc_IOP_ProfileId, 0, sizeof (IOP::ProfileId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProfileId, &_tc_TAO_tc_IOP_ProfileId)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_INTERNET_IOP, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_MULTIPLE_COMPONENTS, 0)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IOP_TaggedProfile[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-  14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
-  2, // member count
-  4, ACE_NTOHL (0x74616700),  // name = tag
-  CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-    10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-    CORBA::tk_ulong,
-
-
-  13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (CORBA::tk_struct, sizeof (_oc_IOP_TaggedProfile), (char *) &_oc_IOP_TaggedProfile, 0, sizeof (IOP::TaggedProfile));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedProfile, &_tc_TAO_tc_IOP_TaggedProfile)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// IOP::TaggedProfile::_tao_seq_Octet
-// *************************************************************
-
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-IOP::TaggedProfile::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-// ****************************************************************
-
-static const CORBA::Long _oc_IOP_IOR[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  24, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-  4, ACE_NTOHL (0x494f5200),  // name = IOR
-  2, // member count
-  8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400),  // name = type_id
-  CORBA::tk_string,
-  0, // string length
-  9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0),  // name = profiles
-  CORBA::tk_sequence, // typecode kind
-  200, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    184, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-      14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
-      2, // member count
-      4, ACE_NTOHL (0x74616700),  // name = tag
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-        10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
-        CORBA::tk_ulong,
-
-
-      13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
-      CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
-
-        0,
-
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (CORBA::tk_struct, sizeof (_oc_IOP_IOR), (char *) &_oc_IOP_IOR, 0, sizeof (IOP::IOR));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IOR, &_tc_TAO_tc_IOP_IOR)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// IOP::IOR::_tao_seq_TaggedProfile
-// *************************************************************
-
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (void)
-{}
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<IOP::TaggedProfile> (max)
-{}
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedProfile *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<IOP::TaggedProfile> (max, length, buffer, release)
-{}
-IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq) // copy ctor
-  : TAO_Unbounded_Sequence<IOP::TaggedProfile> (seq)
-{}
-IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) // dtor
-{}
-
-static const CORBA::Long _oc_IOP_ComponentId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-  12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
-  CORBA::tk_ulong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId (CORBA::tk_alias, sizeof (_oc_IOP_ComponentId), (char *) &_oc_IOP_ComponentId, 0, sizeof (IOP::ComponentId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentId, &_tc_TAO_tc_IOP_ComponentId)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IOP_TaggedComponent[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-  16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-  2, // member count
-  4, ACE_NTOHL (0x74616700),  // name = tag
-  CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-    12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
-    CORBA::tk_ulong,
-
-
-  15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (CORBA::tk_struct, sizeof (_oc_IOP_TaggedComponent), (char *) &_oc_IOP_TaggedComponent, 0, sizeof (IOP::TaggedComponent));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponent, &_tc_TAO_tc_IOP_TaggedComponent)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// IOP::TaggedComponent::_tao_seq_Octet
-// *************************************************************
-
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{}
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
-{}
-IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
-{}
-IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-// *************************************************************
-// IOP::MultipleComponentProfile
-// *************************************************************
-
-IOP::MultipleComponentProfile::MultipleComponentProfile (void)
-{}
-IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<IOP::TaggedComponent> (max)
-{}
-IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<IOP::TaggedComponent> (max, length, buffer, release)
-{}
-IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq) // copy ctor
-  : TAO_Unbounded_Sequence<IOP::TaggedComponent> (seq)
-{}
-IOP::MultipleComponentProfile::~MultipleComponentProfile (void) // dtor
-{}
-
-static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x69706c65), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7450726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
-  25, ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x69706c65), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7450726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x0),  // name = MultipleComponentProfile
-  CORBA::tk_sequence, // typecode kind
-  200, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    184, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-      16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-      2, // member count
-      4, ACE_NTOHL (0x74616700),  // name = tag
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
-        CORBA::tk_ulong,
-
-
-      15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
-      CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
-
-        0,
-
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (CORBA::tk_alias, sizeof (_oc_IOP_MultipleComponentProfile), (char *) &_oc_IOP_MultipleComponentProfile, 0, sizeof (IOP::MultipleComponentProfile));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MultipleComponentProfile, &_tc_TAO_tc_IOP_MultipleComponentProfile)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ORB_TYPE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CODE_SETS, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ALTERNATE_IIOP_ADDRESS, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ASSOCIATION_OPTIONS, 13)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SEC_NAME, 14)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SPKM_1_SEC_MECH, 15)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SPKM_2_SEC_MECH, 16)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_KerberosV5_SEC_MECH, 17)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Secret_SEC_MECH, 18)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Hybrid_SEC_MECH, 19)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_SSL_SEC_TRANS, 20)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_CSI_ECMA_Public_SEC_MECH, 21)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_GENERIC_SEC_MECH, 22)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_COMPLETE_OBJECT_KEY, 5)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ENDPOINT_ID_POSITION, 6)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_LOCATION_POLICY, 12)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_STRING_BINDING, 100)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_BINDING_NAME, 101)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_NO_PIPES, 102)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_DCE_SEC_MECH, 103)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IOP_ServiceId[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-  10, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000),  // name = ServiceId
-  CORBA::tk_ulong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId (CORBA::tk_alias, sizeof (_oc_IOP_ServiceId), (char *) &_oc_IOP_ServiceId, 0, sizeof (IOP::ServiceId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceId, &_tc_TAO_tc_IOP_ServiceId)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IOP_ServiceContext[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-  15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = ServiceContext
-  2, // member count
-  11, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x69640000),  // name = context_id
-  CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-    10, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000),  // name = ServiceId
-    CORBA::tk_ulong,
-
-
-  13, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = context_data
-  CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (CORBA::tk_struct, sizeof (_oc_IOP_ServiceContext), (char *) &_oc_IOP_ServiceContext, 0, sizeof (IOP::ServiceContext));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContext, &_tc_TAO_tc_IOP_ServiceContext)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// IOP::ServiceContext::_tao_seq_Octet
-// *************************************************************
-
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{}
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
-{}
-IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
-{}
-IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-// *************************************************************
-// IOP::ServiceContextList
-// *************************************************************
-
-IOP::ServiceContextList::ServiceContextList (void)
-{}
-IOP::ServiceContextList::ServiceContextList (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<IOP::ServiceContext> (max)
-{}
-IOP::ServiceContextList::ServiceContextList (CORBA::ULong max, CORBA::ULong length, IOP::ServiceContext *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<IOP::ServiceContext> (max, length, buffer, release)
-{}
-IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq) // copy ctor
-  : TAO_Unbounded_Sequence<IOP::ServiceContext> (seq)
-{}
-IOP::ServiceContextList::~ServiceContextList (void) // dtor
-{}
-
-static const CORBA::Long _oc_IOP_ServiceContextList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744c69), ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
-  19, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744c69), ACE_NTOHL (0x73740000),  // name = ServiceContextList
-  CORBA::tk_sequence, // typecode kind
-  208, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    192, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-      15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = ServiceContext
-      2, // member count
-      11, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x69640000),  // name = context_id
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-        10, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000),  // name = ServiceId
-        CORBA::tk_ulong,
-
-
-      13, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = context_data
-      CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
-
-        0,
-
-
-    0,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (CORBA::tk_alias, sizeof (_oc_IOP_ServiceContextList), (char *) &_oc_IOP_ServiceContextList, 0, sizeof (IOP::ServiceContextList));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContextList, &_tc_TAO_tc_IOP_ServiceContextList)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TransactionService, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, CodeSets, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassCheck, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ChainBypassInfo, 3)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, LogicalThreadId, 4)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, BI_DIR_IIOP, 5)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SendingContextRunTime, 6)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 7)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, UnknownExceptionInfo, 9)
-TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedProfile &_tao_elem) // copying
-{
-  IOP::TaggedProfile *_any_val;
-  ACE_NEW (_any_val, IOP::TaggedProfile (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_TaggedProfile, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::TaggedProfile *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_TaggedProfile, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedProfile *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_TaggedProfile, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::TaggedProfile *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::TaggedProfile, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_TaggedProfile, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_TaggedProfile, _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 IOP::IOR &_tao_elem) // copying
-{
-  IOP::IOR *_any_val;
-  ACE_NEW (_any_val, IOP::IOR (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_IOR, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::IOR *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_IOR, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::IOR *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_IOR, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::IOR *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::IOR, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_IOR, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_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 IOP::TaggedComponent &_tao_elem) // copying
-{
-  IOP::TaggedComponent *_any_val;
-  ACE_NEW (_any_val, IOP::TaggedComponent (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_TaggedComponent, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::TaggedComponent *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_TaggedComponent, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponent *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_TaggedComponent, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::TaggedComponent *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::TaggedComponent, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_TaggedComponent, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_TaggedComponent, _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 IOP::MultipleComponentProfile &_tao_elem
-  ) // copying
-{
-  IOP::MultipleComponentProfile *_tao_any_val;
-  ACE_NEW (_tao_any_val, IOP::MultipleComponentProfile (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_MultipleComponentProfile, _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, IOP::MultipleComponentProfile *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_MultipleComponentProfile, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::MultipleComponentProfile *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::MultipleComponentProfile *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::MultipleComponentProfile, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_MultipleComponentProfile, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_MultipleComponentProfile, _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 IOP::ServiceContext &_tao_elem) // copying
-{
-  IOP::ServiceContext *_any_val;
-  ACE_NEW (_any_val, IOP::ServiceContext (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_ServiceContext, _any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::ServiceContext *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_ServiceContext, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContext *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_ServiceContext, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::ServiceContext *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::ServiceContext, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_ServiceContext, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_ServiceContext, _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 IOP::ServiceContextList &_tao_elem
-  ) // copying
-{
-  IOP::ServiceContextList *_tao_any_val;
-  ACE_NEW (_tao_any_val, IOP::ServiceContextList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_ServiceContextList, _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, IOP::ServiceContextList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (IOP::_tc_ServiceContextList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContextList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (IOP::_tc_ServiceContextList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (IOP::ServiceContextList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, IOP::ServiceContextList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (IOP::_tc_ServiceContextList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (IOP::_tc_ServiceContextList, _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 IOP::TaggedProfile::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedProfile::_tao_seq_Octet &_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
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::IOR::_tao_seq_TaggedProfile &_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]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::IOR::_tao_seq_TaggedProfile &_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]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedComponent::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedComponent::_tao_seq_Octet &_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
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::MultipleComponentProfile &_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]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::MultipleComponentProfile &_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]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::ServiceContext::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::ServiceContext::_tao_seq_Octet &_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
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::ServiceContextList &_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]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::ServiceContextList &_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]);
-    return _tao_marshal_flag;
-  }
-  return 0; // error
-}
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
deleted file mode 100644
index 8ff683969d4..00000000000
--- a/TAO/tao/IOPC.h
+++ /dev/null
@@ -1,669 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPC.h
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IOPC_H
-#define TAO_IOPC_H
-
-#include "tao/CDR.h"
-#include "tao/Sequence.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 TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  IOP
-{
-  typedef CORBA::ULong ProfileId;
-  typedef CORBA::ULong_out ProfileId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProfileId;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_INTERNET_IOP;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_MULTIPLE_COMPONENTS;
-
-  struct TAO_Export TaggedProfile
-  {
-    ProfileId tag;
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-
-    _tao_seq_Octet profile_data;
-  };
-
-  class TAO_Export TaggedProfile_var
-  {
-  public:
-    TaggedProfile_var (void); // default constructor
-    TaggedProfile_var (TaggedProfile *);
-    TaggedProfile_var (const TaggedProfile_var &); // copy constructor
-    ~TaggedProfile_var (void); // destructor
-
-    TaggedProfile_var &operator= (TaggedProfile *);
-    TaggedProfile_var &operator= (const TaggedProfile_var &);
-    TaggedProfile *operator-> (void);
-    const TaggedProfile *operator-> (void) const;
-
-    operator const TaggedProfile &() const;
-    operator TaggedProfile &();
-    operator TaggedProfile &() const;
-    // in, inout, out, _retn
-    const TaggedProfile &in (void) const;
-    TaggedProfile &inout (void);
-    TaggedProfile *&out (void);
-    TaggedProfile *_retn (void);
-    TaggedProfile *ptr (void) const;
-
-  private:
-    TaggedProfile *ptr_;
-  };
-
-  class TAO_Export TaggedProfile_out
-  {
-  public:
-    TaggedProfile_out (TaggedProfile *&);
-    TaggedProfile_out (TaggedProfile_var &);
-    TaggedProfile_out (const TaggedProfile_out &);
-    TaggedProfile_out &operator= (const TaggedProfile_out &);
-    TaggedProfile_out &operator= (TaggedProfile *);
-    operator TaggedProfile *&();
-    TaggedProfile *&ptr (void);
-    TaggedProfile *operator-> (void);
-
-  private:
-    TaggedProfile *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const TaggedProfile_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedProfile;
-
-  struct TAO_Export IOR
-  {
-    TAO_String_Manager type_id;
-
-
-    // *************************************************************
-    // _tao_seq_TaggedProfile
-    // *************************************************************
-
-    class TAO_Export _tao_seq_TaggedProfile : public TAO_Unbounded_Sequence<TaggedProfile>
-    {
-    public:
-      _tao_seq_TaggedProfile (void); // default ctor
-      _tao_seq_TaggedProfile (CORBA::ULong max); // uses max size
-      _tao_seq_TaggedProfile (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedProfile *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &); // copy ctor
-      ~_tao_seq_TaggedProfile (void); // dtor
-    };
-    typedef _tao_seq_TaggedProfile *_tao_seq_TaggedProfile_ptr;
-
-    _tao_seq_TaggedProfile profiles;
-  };
-
-  class TAO_Export IOR_var
-  {
-  public:
-    IOR_var (void); // default constructor
-    IOR_var (IOR *);
-    IOR_var (const IOR_var &); // copy constructor
-    ~IOR_var (void); // destructor
-
-    IOR_var &operator= (IOR *);
-    IOR_var &operator= (const IOR_var &);
-    IOR *operator-> (void);
-    const IOR *operator-> (void) const;
-
-    operator const IOR &() const;
-    operator IOR &();
-    operator IOR &() const;
-    // in, inout, out, _retn
-    const IOR &in (void) const;
-    IOR &inout (void);
-    IOR *&out (void);
-    IOR *_retn (void);
-    IOR *ptr (void) const;
-
-  private:
-    IOR *ptr_;
-  };
-
-  class TAO_Export IOR_out
-  {
-  public:
-    IOR_out (IOR *&);
-    IOR_out (IOR_var &);
-    IOR_out (const IOR_out &);
-    IOR_out &operator= (const IOR_out &);
-    IOR_out &operator= (IOR *);
-    operator IOR *&();
-    IOR *&ptr (void);
-    IOR *operator-> (void);
-
-  private:
-    IOR *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const IOR_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IOR;
-
-  typedef CORBA::ULong ComponentId;
-  typedef CORBA::ULong_out ComponentId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentId;
-
-  struct TAO_Export TaggedComponent
-  {
-    ComponentId tag;
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-    typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-
-    _tao_seq_Octet component_data;
-  };
-
-  class TAO_Export TaggedComponent_var
-  {
-  public:
-    TaggedComponent_var (void); // default constructor
-    TaggedComponent_var (TaggedComponent *);
-    TaggedComponent_var (const TaggedComponent_var &); // copy constructor
-    ~TaggedComponent_var (void); // destructor
-
-    TaggedComponent_var &operator= (TaggedComponent *);
-    TaggedComponent_var &operator= (const TaggedComponent_var &);
-    TaggedComponent *operator-> (void);
-    const TaggedComponent *operator-> (void) const;
-
-    operator const TaggedComponent &() const;
-    operator TaggedComponent &();
-    operator TaggedComponent &() const;
-    // in, inout, out, _retn
-    const TaggedComponent &in (void) const;
-    TaggedComponent &inout (void);
-    TaggedComponent *&out (void);
-    TaggedComponent *_retn (void);
-    TaggedComponent *ptr (void) const;
-
-  private:
-    TaggedComponent *ptr_;
-  };
-
-  class TAO_Export TaggedComponent_out
-  {
-  public:
-    TaggedComponent_out (TaggedComponent *&);
-    TaggedComponent_out (TaggedComponent_var &);
-    TaggedComponent_out (const TaggedComponent_out &);
-    TaggedComponent_out &operator= (const TaggedComponent_out &);
-    TaggedComponent_out &operator= (TaggedComponent *);
-    operator TaggedComponent *&();
-    TaggedComponent *&ptr (void);
-    TaggedComponent *operator-> (void);
-
-  private:
-    TaggedComponent *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const TaggedComponent_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedComponent;
-
-  class TAO_Export MultipleComponentProfile : public TAO_Unbounded_Sequence<TaggedComponent>
-  {
-  public:
-    MultipleComponentProfile (void); // default ctor
-    MultipleComponentProfile (CORBA::ULong max); // uses max size
-    MultipleComponentProfile (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      TaggedComponent *buffer,
-      CORBA::Boolean release=0
-    );
-    MultipleComponentProfile (const MultipleComponentProfile &); // copy ctor
-    ~MultipleComponentProfile (void); // dtor
-  };
-  typedef MultipleComponentProfile *MultipleComponentProfile_ptr;
-
-  // *************************************************************
-  // class IOP::MultipleComponentProfile_var
-  // *************************************************************
-
-  class TAO_Export MultipleComponentProfile_var
-  {
-  public:
-    MultipleComponentProfile_var (void); // default constructor
-    MultipleComponentProfile_var (MultipleComponentProfile *);
-    MultipleComponentProfile_var (const MultipleComponentProfile_var &); // copy constructor
-    ~MultipleComponentProfile_var (void); // destructor
-
-    MultipleComponentProfile_var &operator= (MultipleComponentProfile *);
-    MultipleComponentProfile_var &operator= (const MultipleComponentProfile_var &);
-    MultipleComponentProfile *operator-> (void);
-    const MultipleComponentProfile *operator-> (void) const;
-
-    operator const MultipleComponentProfile &() const;
-    operator MultipleComponentProfile &();
-    operator MultipleComponentProfile &() const;
-    TaggedComponent &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
-    const MultipleComponentProfile &in (void) const;
-    MultipleComponentProfile &inout (void);
-    MultipleComponentProfile *&out (void);
-    MultipleComponentProfile *_retn (void);
-    MultipleComponentProfile *ptr (void) const;
-
-  private:
-    MultipleComponentProfile *ptr_;
-  };
-
-  class TAO_Export MultipleComponentProfile_out
-  {
-  public:
-    MultipleComponentProfile_out (MultipleComponentProfile *&);
-    MultipleComponentProfile_out (MultipleComponentProfile_var &);
-    MultipleComponentProfile_out (const MultipleComponentProfile_out &);
-    MultipleComponentProfile_out &operator= (const MultipleComponentProfile_out &);
-    MultipleComponentProfile_out &operator= (MultipleComponentProfile *);
-    operator MultipleComponentProfile *&();
-    MultipleComponentProfile *&ptr (void);
-    MultipleComponentProfile *operator-> (void);
-    TaggedComponent &operator[] (CORBA::ULong index);
-
-  private:
-    MultipleComponentProfile *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const MultipleComponentProfile_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MultipleComponentProfile;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ORB_TYPE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CODE_SETS;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ALTERNATE_IIOP_ADDRESS;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ASSOCIATION_OPTIONS;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SEC_NAME;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SPKM_1_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SPKM_2_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_KerberosV5_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CSI_ECMA_Secret_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CSI_ECMA_Hybrid_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_SSL_SEC_TRANS;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CSI_ECMA_Public_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_GENERIC_SEC_MECH;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_COMPLETE_OBJECT_KEY;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ENDPOINT_ID_POSITION;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_LOCATION_POLICY;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_STRING_BINDING;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_BINDING_NAME;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_NO_PIPES;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_DCE_SEC_MECH;
-
-  typedef CORBA::ULong ServiceId;
-  typedef CORBA::ULong_out ServiceId_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceId;
-
-  struct TAO_Export ServiceContext
-  {
-    ServiceId context_id;
-
-    // *************************************************************
-    // _tao_seq_Octet
-    // *************************************************************
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-    typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-
-    _tao_seq_Octet context_data;
-  };
-
-  class TAO_Export ServiceContext_var
-  {
-  public:
-    ServiceContext_var (void); // default constructor
-    ServiceContext_var (ServiceContext *);
-    ServiceContext_var (const ServiceContext_var &); // copy constructor
-    ~ServiceContext_var (void); // destructor
-
-    ServiceContext_var &operator= (ServiceContext *);
-    ServiceContext_var &operator= (const ServiceContext_var &);
-    ServiceContext *operator-> (void);
-    const ServiceContext *operator-> (void) const;
-
-    operator const ServiceContext &() const;
-    operator ServiceContext &();
-    operator ServiceContext &() const;
-    // in, inout, out, _retn
-    const ServiceContext &in (void) const;
-    ServiceContext &inout (void);
-    ServiceContext *&out (void);
-    ServiceContext *_retn (void);
-    ServiceContext *ptr (void) const;
-
-  private:
-    ServiceContext *ptr_;
-  };
-
-  class TAO_Export ServiceContext_out
-  {
-  public:
-    ServiceContext_out (ServiceContext *&);
-    ServiceContext_out (ServiceContext_var &);
-    ServiceContext_out (const ServiceContext_out &);
-    ServiceContext_out &operator= (const ServiceContext_out &);
-    ServiceContext_out &operator= (ServiceContext *);
-    operator ServiceContext *&();
-    ServiceContext *&ptr (void);
-    ServiceContext *operator-> (void);
-
-  private:
-    ServiceContext *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const ServiceContext_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceContext;
-
-  class TAO_Export ServiceContextList : public TAO_Unbounded_Sequence<ServiceContext>
-  {
-  public:
-    ServiceContextList (void); // default ctor
-    ServiceContextList (CORBA::ULong max); // uses max size
-    ServiceContextList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      ServiceContext *buffer,
-      CORBA::Boolean release=0
-    );
-    ServiceContextList (const ServiceContextList &); // copy ctor
-    ~ServiceContextList (void); // dtor
-  };
-  typedef ServiceContextList *ServiceContextList_ptr;
-
-  // *************************************************************
-  // class IOP::ServiceContextList_var
-  // *************************************************************
-
-  class TAO_Export ServiceContextList_var
-  {
-  public:
-    ServiceContextList_var (void); // default constructor
-    ServiceContextList_var (ServiceContextList *);
-    ServiceContextList_var (const ServiceContextList_var &); // copy constructor
-    ~ServiceContextList_var (void); // destructor
-
-    ServiceContextList_var &operator= (ServiceContextList *);
-    ServiceContextList_var &operator= (const ServiceContextList_var &);
-    ServiceContextList *operator-> (void);
-    const ServiceContextList *operator-> (void) const;
-
-    operator const ServiceContextList &() const;
-    operator ServiceContextList &();
-    operator ServiceContextList &() const;
-    ServiceContext &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
-    const ServiceContextList &in (void) const;
-    ServiceContextList &inout (void);
-    ServiceContextList *&out (void);
-    ServiceContextList *_retn (void);
-    ServiceContextList *ptr (void) const;
-
-  private:
-    ServiceContextList *ptr_;
-  };
-
-  class TAO_Export ServiceContextList_out
-  {
-  public:
-    ServiceContextList_out (ServiceContextList *&);
-    ServiceContextList_out (ServiceContextList_var &);
-    ServiceContextList_out (const ServiceContextList_out &);
-    ServiceContextList_out &operator= (const ServiceContextList_out &);
-    ServiceContextList_out &operator= (ServiceContextList *);
-    operator ServiceContextList *&();
-    ServiceContextList *&ptr (void);
-    ServiceContextList *operator-> (void);
-    ServiceContext &operator[] (CORBA::ULong index);
-
-  private:
-    ServiceContextList *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const ServiceContextList_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServiceContextList;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TransactionService;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong CodeSets;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ChainBypassCheck;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ChainBypassInfo;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LogicalThreadId;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong BI_DIR_IIOP;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SendingContextRunTime;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong UnknownExceptionInfo;
-
-
-}; // module IOP
-
-void TAO_Export operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::TaggedProfile *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::IOR &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::IOR*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::IOR *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::TaggedComponent &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::TaggedComponent*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::TaggedComponent *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::MultipleComponentProfile &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::MultipleComponentProfile*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::MultipleComponentProfile *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::ServiceContext *&);
-void TAO_Export operator<<= (CORBA::Any &, const IOP::ServiceContextList &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, IOP::ServiceContextList *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, IOP::TaggedProfile &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedProfile::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedProfile::_tao_seq_Octet &
-  );
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const IOP::IOR &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, IOP::IOR &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::IOR::_tao_seq_TaggedProfile &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::IOR::_tao_seq_TaggedProfile &
-  );
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const IOP::TaggedComponent &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, IOP::TaggedComponent &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponent::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponent::_tao_seq_Octet &
-  );
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::MultipleComponentProfile &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::MultipleComponentProfile &
-  );
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const IOP::ServiceContext &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, IOP::ServiceContext &);
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContext::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContext::_tao_seq_Octet &
-  );
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContextList &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContextList &
-  );
-
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "tao/IOPC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IOPC_H */
diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i
deleted file mode 100644
index 2e758adc062..00000000000
--- a/TAO/tao/IOPC.i
+++ /dev/null
@@ -1,1189 +0,0 @@
-// $Id$
-
-// *************************************************************
-// Inline operations for class IOP::TaggedProfile_var
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedProfile_var::TaggedProfile_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::TaggedProfile_var::TaggedProfile_var (IOP::TaggedProfile *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::TaggedProfile_var::TaggedProfile_var (const IOP::TaggedProfile_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::TaggedProfile(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_var::~TaggedProfile_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile_var &
-IOP::TaggedProfile_var::operator= (IOP::TaggedProfile *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::TaggedProfile_var &
-IOP::TaggedProfile_var::operator= (const IOP::TaggedProfile_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::TaggedProfile (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::TaggedProfile *
-IOP::TaggedProfile_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile *
-IOP::TaggedProfile_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_var::operator const IOP::TaggedProfile &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_var::operator IOP::TaggedProfile &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_var::operator IOP::TaggedProfile &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const IOP::TaggedProfile &
-IOP::TaggedProfile_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile &
-IOP::TaggedProfile_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::TaggedProfile *&
-IOP::TaggedProfile_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile *
-IOP::TaggedProfile_var::_retn (void)
-{
-  IOP::TaggedProfile *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::TaggedProfile *
-IOP::TaggedProfile_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::TaggedProfile_out
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedProfile_out::TaggedProfile_out (IOP::TaggedProfile *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_out::TaggedProfile_out (IOP::TaggedProfile_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_out::TaggedProfile_out (const IOP::TaggedProfile_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::TaggedProfile_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::TaggedProfile_out &
-IOP::TaggedProfile_out::operator= (const IOP::TaggedProfile_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::TaggedProfile_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::TaggedProfile_out &
-IOP::TaggedProfile_out::operator= (IOP::TaggedProfile *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::TaggedProfile_out::operator IOP::TaggedProfile *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile *&
-IOP::TaggedProfile_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile *
-IOP::TaggedProfile_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::IOR_var
-// *************************************************************
-
-ACE_INLINE
-IOP::IOR_var::IOR_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::IOR_var::IOR_var (IOP::IOR *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::IOR_var::IOR_var (const IOP::IOR_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::IOR(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::IOR_var::~IOR_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::IOR_var &
-IOP::IOR_var::operator= (IOP::IOR *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::IOR_var &
-IOP::IOR_var::operator= (const IOP::IOR_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::IOR (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::IOR *
-IOP::IOR_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::IOR *
-IOP::IOR_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::IOR_var::operator const IOP::IOR &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::IOR_var::operator IOP::IOR &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::IOR_var::operator IOP::IOR &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const IOP::IOR &
-IOP::IOR_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::IOR &
-IOP::IOR_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::IOR *&
-IOP::IOR_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::IOR *
-IOP::IOR_var::_retn (void)
-{
-  IOP::IOR *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::IOR *
-IOP::IOR_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::IOR_out
-// *************************************************************
-
-ACE_INLINE
-IOP::IOR_out::IOR_out (IOP::IOR *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::IOR_out::IOR_out (IOP::IOR_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::IOR_out::IOR_out (const IOP::IOR_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::IOR_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::IOR_out &
-IOP::IOR_out::operator= (const IOP::IOR_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::IOR_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::IOR_out &
-IOP::IOR_out::operator= (IOP::IOR *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::IOR_out::operator IOP::IOR *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::IOR *&
-IOP::IOR_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::IOR *
-IOP::IOR_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::TaggedComponent_var
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedComponent_var::TaggedComponent_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::TaggedComponent_var::TaggedComponent_var (IOP::TaggedComponent *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::TaggedComponent_var::TaggedComponent_var (const IOP::TaggedComponent_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::TaggedComponent(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_var::~TaggedComponent_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent_var &
-IOP::TaggedComponent_var::operator= (IOP::TaggedComponent *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::TaggedComponent_var &
-IOP::TaggedComponent_var::operator= (const IOP::TaggedComponent_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::TaggedComponent (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::TaggedComponent *
-IOP::TaggedComponent_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent *
-IOP::TaggedComponent_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_var::operator const IOP::TaggedComponent &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_var::operator IOP::TaggedComponent &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_var::operator IOP::TaggedComponent &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const IOP::TaggedComponent &
-IOP::TaggedComponent_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent &
-IOP::TaggedComponent_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::TaggedComponent *&
-IOP::TaggedComponent_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent *
-IOP::TaggedComponent_var::_retn (void)
-{
-  IOP::TaggedComponent *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::TaggedComponent *
-IOP::TaggedComponent_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::TaggedComponent_out
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedComponent_out::TaggedComponent_out (IOP::TaggedComponent *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_out::TaggedComponent_out (IOP::TaggedComponent_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_out::TaggedComponent_out (const IOP::TaggedComponent_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::TaggedComponent_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::TaggedComponent_out &
-IOP::TaggedComponent_out::operator= (const IOP::TaggedComponent_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::TaggedComponent_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::TaggedComponent_out &
-IOP::TaggedComponent_out::operator= (IOP::TaggedComponent *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::TaggedComponent_out::operator IOP::TaggedComponent *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent *&
-IOP::TaggedComponent_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent *
-IOP::TaggedComponent_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::MultipleComponentProfile_var
-// *************************************************************
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (IOP::MultipleComponentProfile *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (const IOP::MultipleComponentProfile_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::MultipleComponentProfile(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::~MultipleComponentProfile_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile_var &
-IOP::MultipleComponentProfile_var::operator= (IOP::MultipleComponentProfile *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile_var &
-IOP::MultipleComponentProfile_var::operator= (const IOP::MultipleComponentProfile_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::MultipleComponentProfile (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::operator const IOP::MultipleComponentProfile &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::operator IOP::MultipleComponentProfile &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_var::operator IOP::MultipleComponentProfile &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent &
-IOP::MultipleComponentProfile_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const IOP::MultipleComponentProfile &
-IOP::MultipleComponentProfile_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile &
-IOP::MultipleComponentProfile_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::MultipleComponentProfile *&
-IOP::MultipleComponentProfile_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_var::_retn (void)
-{
-  IOP::MultipleComponentProfile *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::MultipleComponentProfile_out
-// *************************************************************
-
-ACE_INLINE
-IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (IOP::MultipleComponentProfile *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (IOP::MultipleComponentProfile_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_out::MultipleComponentProfile_out (const IOP::MultipleComponentProfile_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::MultipleComponentProfile_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::MultipleComponentProfile_out &
-IOP::MultipleComponentProfile_out::operator= (const IOP::MultipleComponentProfile_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::MultipleComponentProfile_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile_out &
-IOP::MultipleComponentProfile_out::operator= (IOP::MultipleComponentProfile *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::MultipleComponentProfile_out::operator IOP::MultipleComponentProfile *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *&
-IOP::MultipleComponentProfile_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::MultipleComponentProfile *
-IOP::MultipleComponentProfile_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent &
-IOP::MultipleComponentProfile_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContext_var
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContext_var::ServiceContext_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::ServiceContext_var::ServiceContext_var (IOP::ServiceContext *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::ServiceContext_var::ServiceContext_var (const IOP::ServiceContext_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::ServiceContext(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContext_var::~ServiceContext_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext_var &
-IOP::ServiceContext_var::operator= (IOP::ServiceContext *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::ServiceContext_var &
-IOP::ServiceContext_var::operator= (const IOP::ServiceContext_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::ServiceContext (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::ServiceContext *
-IOP::ServiceContext_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext *
-IOP::ServiceContext_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContext_var::operator const IOP::ServiceContext &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContext_var::operator IOP::ServiceContext &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContext_var::operator IOP::ServiceContext &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const IOP::ServiceContext &
-IOP::ServiceContext_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext &
-IOP::ServiceContext_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::ServiceContext *&
-IOP::ServiceContext_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext *
-IOP::ServiceContext_var::_retn (void)
-{
-  IOP::ServiceContext *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::ServiceContext *
-IOP::ServiceContext_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContext_out
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContext_out::ServiceContext_out (IOP::ServiceContext *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContext_out::ServiceContext_out (IOP::ServiceContext_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContext_out::ServiceContext_out (const IOP::ServiceContext_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::ServiceContext_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::ServiceContext_out &
-IOP::ServiceContext_out::operator= (const IOP::ServiceContext_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::ServiceContext_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::ServiceContext_out &
-IOP::ServiceContext_out::operator= (IOP::ServiceContext *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::ServiceContext_out::operator IOP::ServiceContext *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext *&
-IOP::ServiceContext_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext *
-IOP::ServiceContext_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContextList_var
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContextList_var::ServiceContextList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::ServiceContextList_var::ServiceContextList_var (IOP::ServiceContextList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::ServiceContextList_var::ServiceContextList_var (const IOP::ServiceContextList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new IOP::ServiceContextList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_var::~ServiceContextList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList_var &
-IOP::ServiceContextList_var::operator= (IOP::ServiceContextList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::ServiceContextList_var &
-IOP::ServiceContextList_var::operator= (const IOP::ServiceContextList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new IOP::ServiceContextList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const IOP::ServiceContextList *
-IOP::ServiceContextList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList *
-IOP::ServiceContextList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_var::operator const IOP::ServiceContextList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_var::operator IOP::ServiceContextList &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_var::operator IOP::ServiceContextList &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext &
-IOP::ServiceContextList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const IOP::ServiceContextList &
-IOP::ServiceContextList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList &
-IOP::ServiceContextList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE IOP::ServiceContextList *&
-IOP::ServiceContextList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList *
-IOP::ServiceContextList_var::_retn (void)
-{
-  IOP::ServiceContextList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE IOP::ServiceContextList *
-IOP::ServiceContextList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContextList_out
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContextList_out::ServiceContextList_out (IOP::ServiceContextList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_out::ServiceContextList_out (IOP::ServiceContextList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_out::ServiceContextList_out (const IOP::ServiceContextList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IOP::ServiceContextList_out&,p).ptr_)
-{}
-
-ACE_INLINE IOP::ServiceContextList_out &
-IOP::ServiceContextList_out::operator= (const IOP::ServiceContextList_out &p)
-{
-  this->ptr_ = ACE_const_cast (IOP::ServiceContextList_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::ServiceContextList_out &
-IOP::ServiceContextList_out::operator= (IOP::ServiceContextList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-IOP::ServiceContextList_out::operator IOP::ServiceContextList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList *&
-IOP::ServiceContextList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContextList *
-IOP::ServiceContextList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext &
-IOP::ServiceContextList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedProfile::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedProfile::_tao_seq_Octet &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedProfile &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.tag) &&
-    (strm << _tao_aggregate.profile_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedProfile &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.tag) &&
-    (strm >> _tao_aggregate.profile_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::IOR::_tao_seq_TaggedProfile &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::IOR::_tao_seq_TaggedProfile &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::IOR &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.type_id.in ()) &&
-    (strm << _tao_aggregate.profiles)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::IOR &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.type_id.out ()) &&
-    (strm >> _tao_aggregate.profiles)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponent::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponent::_tao_seq_Octet &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::TaggedComponent &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.tag) &&
-    (strm << _tao_aggregate.component_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::TaggedComponent &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.tag) &&
-    (strm >> _tao_aggregate.component_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::MultipleComponentProfile &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::MultipleComponentProfile &
-  );
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContext::_tao_seq_Octet &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContext::_tao_seq_Octet &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::ServiceContext &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.context_id) &&
-    (strm << _tao_aggregate.context_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::ServiceContext &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.context_id) &&
-    (strm >> _tao_aggregate.context_data)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContextList &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContextList &
-  );
diff --git a/TAO/tao/IOPS.cpp b/TAO/tao/IOPS.cpp
deleted file mode 100644
index b8ad217fde6..00000000000
--- a/TAO/tao/IOPS.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPS.h
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "IOPS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "IOPS.i"
-#endif /* !defined INLINE */
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
deleted file mode 100644
index 6584475e3a3..00000000000
--- a/TAO/tao/IOPS.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPS.h
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IOPS_H
-#define TAO_IOPS_H
-
-#include "IOPC.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_IOP
-{
-};
-
-#include "IOPS_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "IOPS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IOPS_H */
diff --git a/TAO/tao/IOPS.i b/TAO/tao/IOPS.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/IOPS.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/IOPS_T.cpp b/TAO/tao/IOPS_T.cpp
deleted file mode 100644
index b80bcaff451..00000000000
--- a/TAO/tao/IOPS_T.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPS_T.cpp
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IOPS_T_CPP
-#define TAO_IOPS_T_CPP
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "IOPS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "IOPS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* TAO_IOPS_T_CPP */
diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h
deleted file mode 100644
index ed25a1b5035..00000000000
--- a/TAO/tao/IOPS_T.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   IOPS_T.cpp
-//
-// = DESCRIPTION
-//   Generated from IOP.pidl, that contains the OMG standarized IOP
-//   module.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IOPS_T_H
-#define TAO_IOPS_T_H
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "IOPS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "IOPS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("IOPS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IOPS_T_H */
diff --git a/TAO/tao/IOPS_T.i b/TAO/tao/IOPS_T.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/IOPS_T.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 9098f50832d..947b8c845b0 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -95,7 +95,9 @@ TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
 // restarted (e.g. request forwarding).  This is the start/restart entry.
 
 void
-TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
+                            TAO_GIOP::Message_Type message_type,
+                            CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
@@ -122,7 +124,7 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   // assert (this->stub_ != 0);
 
   if (this->stub_ == 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    ACE_THROW (CORBA::INV_OBJREF ());
 
   // Get a pointer to the connector registry, which might be in
   // thread-specific storage, depending on the concurrency model.
@@ -134,11 +136,14 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
 
   // @@ It seems like this is the right spot to re-order the profiles
   // based on the policies in the ORB.
-  // IMHO the connector registry only finds one
+  // The following text was here:
+  //     The connection registry is also responsible for selecting the
+  //     profile to use based on some policy or the current forwarding
+  //     state.
+  // IMHO this is not right, the connector registry only finds one
   // connector for the given policies, if the connector is not
   // available (say the user wants an ATM connection, but we don't
   // have the protocol) then we give it another profile to try.
-  // So the invocation Object should handle policy decisions.
 
 #if defined (TAO_HAS_CORBA_MESSAGING)
 #if 0 // @@ TODO implement once PP are merged in
@@ -175,7 +180,7 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
       if (this->transport_ != 0)
         this->transport_->idle ();
 
-      int result = conn_reg->connect (this->profile_, this->transport_);
+      int result = conn_reg->connect (this->stub_, this->transport_);
       if (result == 0)
         break;
 
@@ -183,7 +188,7 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
       // fails then we must raise the TRANSIENT exception.
       if (this->stub_->next_profile_retry () == 0)
         ACE_THROW (CORBA::TRANSIENT (
-          CORBA_SystemException::_tao_minor_code (
+          CORBA_SystemException::minor_code_tao_ (
             TAO_INVOCATION_CONNECT_MINOR_CODE,
             errno),
           CORBA::COMPLETED_NO));
@@ -192,6 +197,87 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   // Obtain unique request id from the RMS.
   this->request_id_ = this->transport_->request_id ();
 
+  // Obtain object key.
+  const TAO_ObjectKey& key = this->profile_->object_key();
+
+  ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_CONNECT);
+
+  // POLICY DECISION: If the client expects most agents to forward,
+  // then it could try to make sure that it's been forwarded at least
+  // once by eliciting it with a LocateRequest message. (Further
+  // hinting in the IIOP::ProfileData could help!)
+  //
+  // That scenario does not match an "Inter" ORB Protocol well, since
+  // bridges chain calls rather than forwarding them.  It does match
+  // some kinds of "Intra" ORB scenarios well, with many agents that
+  // spawn new processes talking to their clients across the net.
+  //
+  // At this time, the policy noted above is followed in the sense
+  // that this software does NOT expect most agents to forward, so it
+  // doesn't bother to probe.  Correctness is not affected; this is
+  // only a quality-of-service policy.  It affects mostly performance,
+  // but the "best efforts" semantics for "oneway" messages would also
+  // be impacted in that some (by definition, buggy!) code which used
+  // only "oneway" messages might not work at all.
+
+  // Build the outgoing message, starting with generic GIOP header.
+
+  if (TAO_GIOP::start_message (message_type,
+                               this->out_stream_,
+                               this->orb_core_) == 0)
+    ACE_THROW (CORBA::MARSHAL ());
+
+  ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_START_MSG);
+
+  // Then fill in the rest of the RequestHeader
+  //
+  // The first element of header is service context list;
+  // transactional context would be acquired here using the
+  // transaction service APIs.  Other kinds of context are as yet
+  // undefined.
+  //
+  // Last element of request header is the principal; no portable way
+  // to get it, we just pass empty principal (convention: indicates
+  // "anybody").  Steps upward in security include passing an
+  // unverified user ID, and then verifying the message (i.e. a dummy
+  // service context entry is set up to hold a digital signature for
+  // this message, then patched shortly before it's sent).
+  static CORBA::Principal_ptr principal = 0;
+
+  // @@ TODO: the service context list should be kept in the ORB, or
+  //    maybe in TSS storage... that is required for interceptors to
+  //    work.
+  // This static is only used to write into the CDR stream, once we
+  // have real service context (needed for the messaging spec) this
+  // will have to be a parameter.
+  static TAO_GIOP_ServiceContextList svc_ctx;
+
+  switch (message_type)
+    {
+    case TAO_GIOP::Request:
+      TAO_GIOP::write_request_header (svc_ctx,
+                                      this->request_id_,
+                                      is_roundtrip,
+                                      key,
+                                      this->opname_,
+                                      principal,
+                                      this->out_stream_,
+                                      this->orb_core_);
+      break;
+
+    case TAO_GIOP::LocateRequest:
+      TAO_GIOP::write_locate_request_header (this->request_id_,
+                                             key,
+                                             this->out_stream_);
+      break;
+
+    default:
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+
+  if (!this->out_stream_.good_bit ())
+    ACE_THROW (CORBA::MARSHAL ());
+
   ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_REQUEST_HDR);
 }
 
@@ -354,7 +440,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
 
   if (this->stub_->next_profile () == 0)
     ACE_THROW_RETURN (CORBA::TRANSIENT (
-      CORBA_SystemException::_tao_minor_code (
+      CORBA_SystemException::minor_code_tao_ (
         TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE,
         errno),
       CORBA::COMPLETED_NO),
@@ -365,26 +451,6 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
 
 // ****************************************************************
 
-void
-TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  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_,
-                                   this->request_id_,
-                                   1,
-                                   this->out_stream_,
-                                   ACE_TRY_ENV);
-}
-
 int
 TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
                                     CORBA::Environment &ACE_TRY_ENV)
@@ -407,7 +473,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
       CORBA::String_var buf;
 
       // Pull the exception ID out of the marshaling buffer.
-      if (this->inp_stream ().read_string (buf.inout ()) == 0)
+      if (this->inp_stream_.read_string (buf.inout ()) == 0)
         {
           // @@ Why do we close the connection. Only the request
           //    failed, but the connection seems to be still
@@ -438,7 +504,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
           // ACE_RETHROW;
 
           const ACE_Message_Block* cdr =
-            this->inp_stream ().start ();
+            this->inp_stream_.start ();
           CORBA_Any any (tcp, 0, cdr);
           CORBA_Exception *exception;
           ACE_NEW_THROW_EX (exception,
@@ -493,7 +559,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
       CORBA::String_var buf;
 
       // Pull the exception ID out of the marshaling buffer.
-      if (this->inp_stream ().read_string (buf.inout ()) == 0)
+      if (this->inp_stream_.read_string (buf.inout ()) == 0)
         {
           // @@ Why do we close the connection. Only the request
           //    failed, but the connection seems to be still
@@ -521,9 +587,9 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
             ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                               TAO_INVOKE_EXCEPTION);
 
-          this->inp_stream ().decode (exception->_type (),
-                                      exception, 0,
-                                      ACE_TRY_ENV);
+          this->inp_stream_.decode (exception->_type (),
+                                    exception, 0,
+                                    ACE_TRY_ENV);
           ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
           if (TAO_debug_level > 5)
@@ -619,7 +685,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
     {
       this->close_connection ();
       ACE_THROW_RETURN (CORBA::COMM_FAILURE (
-        CORBA_SystemException::_tao_minor_code (
+        CORBA_SystemException::minor_code_tao_ (
           TAO_INVOCATION_RECV_REQUEST_MINOR_CODE,
           errno),
         CORBA::COMPLETED_MAYBE),
@@ -654,7 +720,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
         // @@ Add the location macros for this exceptions...
 
         CORBA::String_var type_id;
-        if ((this->inp_stream () >> type_id.inout ()) == 0)
+        if ((this->inp_stream_ >> type_id.inout ()) == 0)
           {
             // Could not demarshal the exception id, raise an local
             // CORBA::MARSHAL
@@ -664,8 +730,8 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
           }
         CORBA::ULong minor = 0;
         CORBA::ULong completion = 0;
-        if ((this->inp_stream () >> minor) == 0
-            || (this->inp_stream () >> completion) == 0)
+        if ((this->inp_stream_ >> minor) == 0
+            || (this->inp_stream_ >> completion) == 0)
           ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                             CORBA::COMPLETED_MAYBE),
                             TAO_INVOKE_OK);
@@ -687,7 +753,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,
+        //    This code works for both native and emulated exceptions, 
         //    but it is ugly.
         ACE_TRY_ENV.exception (ex);
         return TAO_INVOKE_OK;
@@ -697,7 +763,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
     case TAO_GIOP_LOCATION_FORWARD:
       // Handle the forwarding and return so the stub restarts the
       // request!
-      return this->location_forward (this->inp_stream (), ACE_TRY_ENV);
+      return this->location_forward (this->inp_stream_, ACE_TRY_ENV);
       // NOT REACHED.
     }
 
@@ -706,44 +772,8 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
 
 // ****************************************************************
 
-void
-TAO_GIOP_Oneway_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_,
-                                   0,
-                                   this->out_stream_,
-                                   ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
 // 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))
-{
-  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_,
-                                  this->out_stream_,
-                                  ACE_TRY_ENV);
-}
-
 int
 TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -788,7 +818,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
       //    should decide?  Remember that LocateRequests are part of
       //    the strategy to establish a connection.
       ACE_THROW_RETURN (CORBA::TRANSIENT (
-        CORBA_SystemException::_tao_minor_code (
+        CORBA_SystemException::minor_code_tao_ (
           TAO_INVOCATION_SEND_REQUEST_MINOR_CODE,
           errno),
         CORBA::COMPLETED_MAYBE),
@@ -824,7 +854,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
       // NOTREACHED
 
     case TAO_GIOP_OBJECT_FORWARD:
-      return this->location_forward (this->inp_stream (), ACE_TRY_ENV);
+      return this->location_forward (this->inp_stream_, ACE_TRY_ENV);
       // NOTREACHED
     }
 
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 1073979b2c6..33eacbd672a 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -79,7 +79,9 @@ public:
   // return the underlying output stream
 
 protected:
-  void start (CORBA_Environment &ACE_TRY_ENV =
+  void start (CORBA::Boolean is_roundtrip,
+              TAO_GIOP::Message_Type message_type,
+              CORBA_Environment &ACE_TRY_ENV =
                     TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Establishes a connection to the remote server, initializes
@@ -197,7 +199,7 @@ private:
   // send/reply code and the system exceptions.
 
 private:
-  TAO_GIOP_Message_State message_state_;
+  TAO_InputCDR inp_stream_;
   // Stream into which the reply is placed.
 
   TAO_Synch_Reply_Dispatcher rd_;
@@ -247,11 +249,8 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send request, without blocking for any response.
 
-  TAO_InputCDR &inp_stream (void);
-  // return the underlying input stream
-
 private:
-  TAO_GIOP_Message_State message_state_;
+  TAO_InputCDR inp_stream_;
   // 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..5379efc050e 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -25,15 +25,18 @@ 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_)
+    inp_stream_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
+                 TAO_ENCAP_BYTE_ORDER,
+                 orb_core),
+    rd_ (&inp_stream_)
 {
 }
 
-ACE_INLINE TAO_InputCDR &
-TAO_GIOP_Twoway_Invocation::inp_stream (void)
+ACE_INLINE void
+TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->message_state_.cdr;
+  TAO_GIOP_Invocation::start (1, TAO_GIOP::Request, ACE_TRY_ENV);
 }
 
 ACE_INLINE void
@@ -41,7 +44,13 @@ TAO_GIOP_Twoway_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);
+  (void) this->inp_stream_.decode (tc, value, 0, ACE_TRY_ENV);
+}
+
+ACE_INLINE TAO_InputCDR &
+TAO_GIOP_Twoway_Invocation::inp_stream (void)
+{
+  return this->inp_stream_;
 }
 
 // ****************************************************************
@@ -55,6 +64,13 @@ TAO_GIOP_Oneway_Invocation (TAO_Stub *stub,
 {
 }
 
+ACE_INLINE void
+TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO_GIOP_Invocation::start (0, TAO_GIOP::Request, ACE_TRY_ENV);
+}
+
 ACE_INLINE int
 TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -69,13 +85,16 @@ 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_)
+    inp_stream_ (orb_core->create_input_cdr_data_block(ACE_CDR::DEFAULT_BUFSIZE),
+                 TAO_ENCAP_BYTE_ORDER,
+                 orb_core),
+    rd_ (&inp_stream_)
 {
 }
 
-ACE_INLINE TAO_InputCDR &
-TAO_GIOP_Locate_Request_Invocation::inp_stream (void)
+ACE_INLINE void
+TAO_GIOP_Locate_Request_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->message_state_.cdr;
+  TAO_GIOP_Invocation::start (1, TAO_GIOP::LocateRequest, ACE_TRY_ENV);
 }
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 31076582b6d..9edd1ab25e1 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -127,12 +127,7 @@ ORB_CORE_FILES = \
   TAO \
   Wait_Strategy \
   Transport_Mux_Strategy \
-  Reply_Dispatcher \
-  IOPC \
-  IOPS \
-  CONV_FRAMEC \
-  CONV_FRAMES \
-  Tagged_Components
+  Reply_Dispatcher
 
 DYNAMIC_ANY_FILES =
 
@@ -181,10 +176,13 @@ ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
+BIN = # t-sizes
+
 DEFS    = $(addsuffix .h,$(PUB_HDRS))
 
 LDLIBS = -lACE
-LIBS += $(ACELIB)
+LIBS = -lACE
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -452,13 +450,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -482,8 +481,6 @@ realclean:
  $(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/Singleton.h \
@@ -813,13 +810,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -843,8 +841,6 @@ realclean:
  $(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/Singleton.h \
@@ -1030,13 +1026,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -1060,8 +1057,6 @@ realclean:
  $(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/Singleton.h \
@@ -1230,8 +1225,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -1723,13 +1717,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -1753,8 +1748,6 @@ realclean:
  $(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 \
@@ -2004,13 +1997,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
@@ -2076,13 +2071,10 @@ realclean:
  $(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/iopfwd.h \
  $(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/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -2268,13 +2260,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -2298,8 +2291,6 @@ realclean:
  $(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 \
@@ -2389,13 +2380,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Acceptor_Registry.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -2462,13 +2455,10 @@ realclean:
  $(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/iopfwd.h \
  $(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 \
@@ -2629,18 +2619,16 @@ realclean:
  $(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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 .obj/IIOP_Factory.o .obj/IIOP_Factory.so .shobj/IIOP_Factory.o .shobj/IIOP_Factory.so: IIOP_Factory.cpp \
@@ -2764,18 +2752,16 @@ realclean:
  $(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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/IIOP_Acceptor.h \
  $(TAO_ROOT)/tao/IIOP_Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
@@ -2829,6 +2815,8 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -2854,8 +2842,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -2878,10 +2865,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/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -2895,11 +2879,6 @@ realclean:
  $(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 \
@@ -2913,6 +2892,18 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(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/Pluggable.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 \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -2949,45 +2940,20 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(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 \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.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 \
+ $(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 \
@@ -2997,7 +2963,84 @@ realclean:
  $(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 \
+ $(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/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/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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.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 \
@@ -3007,27 +3050,42 @@ realclean:
  $(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 \
+ $(TAO_ROOT)/tao/DynAnyC.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/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/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/iopfwd.h \
+ $(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 \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -3039,9 +3097,6 @@ realclean:
  $(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 \
@@ -3049,19 +3104,10 @@ 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 \
- $(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 \
@@ -3069,107 +3115,7 @@ realclean:
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(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/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)/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_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/debug.h
 .obj/IIOP_Transport.o .obj/IIOP_Transport.so .shobj/IIOP_Transport.o .shobj/IIOP_Transport.so: IIOP_Transport.cpp \
  $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -3243,18 +3189,16 @@ realclean:
  $(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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/IIOP_Connect.h \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -3341,89 +3285,40 @@ realclean:
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/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/ORB.i \
+ $(TAO_ROOT)/tao/DynAnyC.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/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 \
- $(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/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/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/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.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 \
@@ -3433,42 +3328,21 @@ realclean:
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
  $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/iopfwd.h \
  $(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/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 \
- $(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)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(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/debug.h
 .obj/IIOP_Connector.o .obj/IIOP_Connector.so .shobj/IIOP_Connector.o .shobj/IIOP_Connector.so: IIOP_Connector.cpp \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
@@ -3629,13 +3503,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/IIOP_Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
@@ -3643,91 +3519,40 @@ realclean:
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.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/IIOP_Profile.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(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/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/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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/DynAnyC.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/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 \
- $(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/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/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/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.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 \
@@ -3737,38 +3562,18 @@ realclean:
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
  $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/iopfwd.h \
  $(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/params.h \
+ $(TAO_ROOT)/tao/params.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)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h
 .obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.so .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.so: IIOP_Acceptor.cpp \
  $(TAO_ROOT)/tao/IIOP_Acceptor.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -3842,13 +3647,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/IIOP_Connect.h \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -3935,10 +3742,6 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.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/Acceptor_Impl.h \
  $(TAO_ROOT)/tao/Acceptor_Impl.i \
@@ -3953,6 +3756,8 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -3978,8 +3783,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -3998,76 +3802,10 @@ realclean:
  $(TAO_ROOT)/tao/IIOP_Profile.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(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/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 \
- $(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/Key_Adapters.i \
- $(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/Stub.h \
+ $(TAO_ROOT)/tao/IIOP_Profile.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(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)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i
+ $(TAO_ROOT)/tao/debug.h
 .obj/IIOP_Connect.o .obj/IIOP_Connect.so .shobj/IIOP_Connect.o .shobj/IIOP_Connect.so: IIOP_Connect.cpp \
  $(TAO_ROOT)/tao/IIOP_Connect.h \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -4228,18 +3966,16 @@ 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/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/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/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -4252,6 +3988,8 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -4277,8 +4015,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -4414,18 +4151,16 @@ realclean:
  $(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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/UIOP_Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
@@ -4487,6 +4222,8 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -4512,8 +4249,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -4537,10 +4273,7 @@ realclean:
  $(ACE_ROOT)/ace/LSOCK_Connector.i
 .obj/UIOP_Profile.o .obj/UIOP_Profile.so .shobj/UIOP_Profile.o .shobj/UIOP_Profile.so: UIOP_Profile.cpp \
  $(TAO_ROOT)/tao/UIOP_Profile.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
@@ -4554,11 +4287,6 @@ realclean:
  $(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 \
@@ -4572,6 +4300,18 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/UNIX_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/UNIX_Addr.i \
+ $(TAO_ROOT)/tao/Pluggable.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 \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -4608,13 +4348,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
@@ -4693,8 +4435,6 @@ realclean:
  $(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 \
@@ -4704,23 +4444,15 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
  $(ACE_ROOT)/ace/LSOCK_Stream.h \
  $(ACE_ROOT)/ace/LSOCK.h \
  $(ACE_ROOT)/ace/LSOCK.i \
  $(ACE_ROOT)/ace/LSOCK_Stream.i \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/UIOP_Connect.i \
+ $(TAO_ROOT)/tao/UIOP_Profile.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
@@ -4734,24 +4466,42 @@ realclean:
  $(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 \
+ $(TAO_ROOT)/tao/DynAnyC.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/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 \
+ $(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/iopfwd.h \
+ $(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 \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -4763,9 +4513,6 @@ realclean:
  $(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 \
@@ -4773,19 +4520,10 @@ 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 \
- $(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 \
@@ -4793,50 +4531,7 @@ realclean:
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(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/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 \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i
+ $(TAO_ROOT)/tao/debug.h
 .obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp \
  $(TAO_ROOT)/tao/UIOP_Transport.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -4910,18 +4605,16 @@ realclean:
  $(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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/UIOP_Connect.h \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -5016,89 +4709,40 @@ realclean:
  $(ACE_ROOT)/ace/LSOCK_Stream.i \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
  $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/UIOP_Profile.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/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/ORB.i \
+ $(TAO_ROOT)/tao/DynAnyC.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/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 \
- $(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/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/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/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.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 \
@@ -5108,42 +4752,21 @@ realclean:
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
  $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/iopfwd.h \
  $(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/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 \
- $(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)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i \
- $(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/debug.h
 .obj/UIOP_Connector.o .obj/UIOP_Connector.so .shobj/UIOP_Connector.o .shobj/UIOP_Connector.so: UIOP_Connector.cpp \
  $(TAO_ROOT)/tao/UIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
@@ -5312,13 +4935,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/UIOP_Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
@@ -5328,91 +4953,40 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(ACE_ROOT)/ace/LSOCK_Acceptor.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/UIOP_Profile.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/UIOP_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/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/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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/DynAnyC.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/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 \
- $(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/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/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/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.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 \
@@ -5422,38 +4996,17 @@ realclean:
  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
  $(TAO_ROOT)/tao/TimeBaseS.i \
  $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/iopfwd.h \
  $(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/params.h \
+ $(TAO_ROOT)/tao/params.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)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
 .obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.so .shobj/UIOP_Acceptor.o .shobj/UIOP_Acceptor.so: UIOP_Acceptor.cpp \
  $(TAO_ROOT)/tao/UIOP_Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.h \
@@ -5619,19 +5172,17 @@ realclean:
  $(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/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/UIOP_Connect.h \
  $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/UIOP_Connect.h \
  $(TAO_ROOT)/tao/UIOP_Connect.i \
  $(TAO_ROOT)/tao/Acceptor_Impl.h \
  $(TAO_ROOT)/tao/Acceptor_Impl.i \
@@ -5646,6 +5197,8 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -5671,8 +5224,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -5690,76 +5242,9 @@ realclean:
  $(TAO_ROOT)/tao/UIOP_Profile.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(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/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 \
- $(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/Key_Adapters.i \
- $(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/Stub.h \
+ $(TAO_ROOT)/tao/UIOP_Profile.i \
  $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(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)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i
+ $(TAO_ROOT)/tao/MProfile.i
 .obj/UIOP_Connect.o .obj/UIOP_Connect.so .shobj/UIOP_Connect.o .shobj/UIOP_Connect.so: UIOP_Connect.cpp \
  $(TAO_ROOT)/tao/UIOP_Connect.h \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -5928,18 +5413,16 @@ 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/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/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/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -5952,6 +5435,8 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -5977,8 +5462,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -6137,13 +5621,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -6167,8 +5652,6 @@ realclean:
  $(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 \
@@ -6326,13 +5809,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -6356,8 +5840,6 @@ realclean:
  $(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 \
@@ -6469,13 +5951,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -6499,27 +5983,46 @@ realclean:
  $(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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/default_resource.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.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/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/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.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_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/Any.h \
  $(TAO_ROOT)/tao/Any.i \
@@ -6531,10 +6034,22 @@ 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/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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/default_resource.i \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
@@ -6544,16 +6059,12 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.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 \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -6579,6 +6090,7 @@ realclean:
  $(ACE_ROOT)/ace/Select_Reactor.i \
  $(ACE_ROOT)/ace/XtReactor.h \
  $(ACE_ROOT)/ace/FlReactor.h \
+ $(ACE_ROOT)/ace/FlReactor.i \
  $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \
  $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Arg_Shifter.h
@@ -6654,15 +6166,6 @@ realclean:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -6700,6 +6203,13 @@ realclean:
  $(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 \
@@ -6782,15 +6292,6 @@ realclean:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -6828,6 +6329,13 @@ realclean:
  $(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 \
@@ -6837,6 +6345,8 @@ realclean:
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
@@ -6860,8 +6370,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -6978,15 +6487,6 @@ realclean:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -7024,6 +6524,13 @@ realclean:
  $(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 \
@@ -7033,6 +6540,8 @@ realclean:
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -7054,11 +6563,12 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7135,15 +6645,6 @@ realclean:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -7181,6 +6682,13 @@ realclean:
  $(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 \
@@ -7190,6 +6698,8 @@ realclean:
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -7211,11 +6721,12 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
@@ -7383,15 +6894,6 @@ realclean:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -7429,6 +6931,13 @@ realclean:
  $(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 \
@@ -7512,15 +7021,6 @@ realclean:
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
@@ -7558,6 +7058,13 @@ realclean:
  $(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 \
@@ -7956,15 +7463,6 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -7994,6 +7492,13 @@ realclean:
  $(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 \
@@ -8021,13 +7526,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -8051,8 +7557,6 @@ realclean:
  $(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 \
@@ -8141,13 +7645,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -8208,8 +7714,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i
@@ -8643,13 +8148,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -8673,8 +8179,6 @@ realclean:
  $(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 \
@@ -8761,13 +8265,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -8830,8 +8336,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -8844,8 +8349,6 @@ realclean:
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -9010,6 +8513,8 @@ realclean:
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Acceptor_Registry.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Acceptor_Registry.i \
  $(TAO_ROOT)/tao/Connector_Registry.h \
@@ -9075,8 +8580,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9101,8 +8605,6 @@ realclean:
  $(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 \
@@ -9114,8 +8616,6 @@ realclean:
  $(TAO_ROOT)/tao/CDR_Interpreter.h \
  $(TAO_ROOT)/tao/TAO_Internal.h \
  $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -9312,6 +8812,8 @@ realclean:
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -9368,8 +8870,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9400,8 +8901,6 @@ realclean:
  $(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 \
@@ -9650,6 +9149,8 @@ realclean:
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -9700,8 +9201,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9732,8 +9232,6 @@ realclean:
  $(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 \
@@ -10124,9 +9622,6 @@ realclean:
  $(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/Principal.i \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
@@ -10204,10 +9699,7 @@ realclean:
  $(TAO_ROOT)/tao/corbafwd.i \
  $(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/Sequence.i
 .obj/Server_Request.o .obj/Server_Request.so .shobj/Server_Request.o .shobj/Server_Request.so: Server_Request.cpp \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -10281,21 +9773,21 @@ realclean:
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Server_Request.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/GIOP.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
@@ -10359,8 +9851,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -10475,13 +9966,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.i
 .obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp \
@@ -10557,13 +10050,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -10628,13 +10123,10 @@ realclean:
  $(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/iopfwd.h \
  $(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/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -10769,9 +10261,6 @@ realclean:
  $(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/Principal.i \
  $(TAO_ROOT)/tao/debug.h
 .obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \
@@ -10915,13 +10404,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -10945,8 +10435,6 @@ realclean:
  $(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 \
@@ -11296,13 +10784,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -11326,8 +10815,6 @@ realclean:
  $(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 \
@@ -11341,8 +10828,6 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/Marshal.i
 .obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
@@ -11556,9 +11041,6 @@ realclean:
  $(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/Object_KeyC.i \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
@@ -11639,12 +11121,6 @@ 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/CDR.i \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
@@ -11658,6 +11134,12 @@ realclean:
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/GIOP_Server_Request.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/Pluggable.h \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -11720,8 +11202,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -11862,17 +11343,11 @@ realclean:
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(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/GIOP.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
@@ -11880,6 +11355,12 @@ realclean:
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/GIOP_Server_Request.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/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
@@ -11941,8 +11422,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -12126,13 +11606,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -12156,8 +11637,6 @@ realclean:
  $(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 \
@@ -12324,13 +11803,14 @@ realclean:
  $(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/iopfwd.h \
  $(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/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -12354,8 +11834,6 @@ realclean:
  $(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 \
@@ -12379,11 +11857,6 @@ realclean:
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/default_server.i \
  $(TAO_ROOT)/tao/default_resource.h \
- $(TAO_ROOT)/tao/default_resource.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Connector_Registry.h \
- $(TAO_ROOT)/tao/Acceptor_Registry.h \
- $(TAO_ROOT)/tao/Acceptor_Registry.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/Object_Adapter.h \
  $(TAO_ROOT)/tao/Key_Adapters.h \
@@ -12414,6 +11887,11 @@ realclean:
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/default_resource.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Connector_Registry.h \
+ $(TAO_ROOT)/tao/Acceptor_Registry.h \
+ $(TAO_ROOT)/tao/Acceptor_Registry.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -12613,13 +12091,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -12643,10 +12123,6 @@ realclean:
  $(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 \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -12659,6 +12135,8 @@ realclean:
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
@@ -12684,8 +12162,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -12882,13 +12359,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -12908,10 +12387,65 @@ realclean:
  $(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/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/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/GIOP.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_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/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/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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
@@ -13341,13 +12875,15 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Environment.h \
@@ -13412,8 +12948,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -13440,8 +12975,6 @@ realclean:
  $(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 \
@@ -13530,12 +13063,6 @@ 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/CDR.i \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
@@ -13616,948 +13143,8 @@ 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/CDR.i \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i
-.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp \
- $(TAO_ROOT)/tao/IOPC.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/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/IOPC.i \
- $(TAO_ROOT)/tao/Any.h \
- $(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
-.obj/IOPS.o .obj/IOPS.so .shobj/IOPS.o .shobj/IOPS.so: IOPS.cpp IOPS.h IOPC.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/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/IOPC.i \
- IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i
-.obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp CONV_FRAMEC.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/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 \
- CONV_FRAMEC.i CONV_FRAMES.h CONV_FRAMES_T.h CONV_FRAMES_T.i \
- CONV_FRAMES_T.cpp CONV_FRAMES.i
-.obj/CONV_FRAMES.o .obj/CONV_FRAMES.so .shobj/CONV_FRAMES.o .shobj/CONV_FRAMES.so: CONV_FRAMES.cpp CONV_FRAMES.h CONV_FRAMEC.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/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 \
- CONV_FRAMEC.i CONV_FRAMES_T.h CONV_FRAMES_T.i CONV_FRAMES_T.cpp \
- CONV_FRAMES.i
-.obj/Tagged_Components.o .obj/Tagged_Components.so .shobj/Tagged_Components.o .shobj/Tagged_Components.so: Tagged_Components.cpp \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.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/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/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.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/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/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/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)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i
 .obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp \
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -14777,6 +13364,8 @@ realclean:
  $(TAO_ROOT)/tao/Request.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -14833,8 +13422,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i
@@ -15249,8 +13837,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -15394,8 +13981,7 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.h \
  $(TAO_ROOT)/tao/TimeBaseS.h \
@@ -15446,6 +14032,8 @@ realclean:
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -15477,8 +14065,6 @@ realclean:
  $(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 \
@@ -15632,8 +14218,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Operation_Table.h \
@@ -15786,14 +14371,15 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
@@ -15817,8 +14403,6 @@ realclean:
  $(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 \
@@ -15965,8 +14549,7 @@ realclean:
  $(TAO_ROOT)/tao/Servant_Base.i \
  MessagingC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/iopfwd.h \
  MessagingC.i MessagingS.i \
  $(TAO_ROOT)/tao/Messaging_Policy_i.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
@@ -16097,6 +14680,8 @@ realclean:
  $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/MProfile.i \
@@ -16116,8 +14701,7 @@ realclean:
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
index 97675134fab..fd201da3141 100644
--- a/TAO/tao/Marshal.cpp
+++ b/TAO/tao/Marshal.cpp
@@ -82,11 +82,11 @@ TAO_Marshal_Factory::~TAO_Marshal_Factory (void)
 // the kind of the typecode.
 TAO_Marshal_Object *
 TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          CORBA::Environment &TAO_IN_ENV)
 {
   if (tc && tc->kind_ >= 0 && tc->kind_ < CORBA::TC_KIND_COUNT)
     return this->mobj_table_[tc->kind_].obj_;
-  ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+  TAO_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
 }
 
 
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
index 6ddf39ce1b6..a99873292a1 100644
--- a/TAO/tao/Marshal.h
+++ b/TAO/tao/Marshal.h
@@ -22,7 +22,6 @@
 
 #include "tao/corbafwd.h"
 #include "tao/Typecode.h"
-#include "tao/Principal.h"
 #include "tao/Any.h"
 #include "tao/ORB.h"
 
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index a1cd921dd34..ee1abfe7949 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -169,19 +169,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, REBIND_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::RebindPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RebindPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/RebindPolicy:1.0", env))
     return Messaging::RebindPolicy::_nil ();
-  return Messaging::RebindPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::RebindPolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -192,22 +192,31 @@ Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow (
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/RebindPolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RebindPolicy::_nil ());
+    return new Messaging::RebindPolicy(stub);
   return new POA_Messaging::_tao_collocated_RebindPolicy(
       ACE_reinterpret_cast(POA_Messaging::RebindPolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+Messaging::RebindMode Messaging::RebindPolicy::rebind_mode (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    Messaging::RebindMode _tao_retval = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::RebindPolicy::_interface_repository_id (void) const
@@ -233,19 +242,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, SYNC_SCOPE_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::SyncScopePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/SyncScopePolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/SyncScopePolicy:1.0", env))
     return Messaging::SyncScopePolicy::_nil ();
-  return Messaging::SyncScopePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::SyncScopePolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -256,22 +265,31 @@ Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow (
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/SyncScopePolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::SyncScopePolicy::_nil ());
+    return new Messaging::SyncScopePolicy(stub);
   return new POA_Messaging::_tao_collocated_SyncScopePolicy(
       ACE_reinterpret_cast(POA_Messaging::SyncScopePolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+Messaging::SyncScope Messaging::SyncScopePolicy::synchronization (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    Messaging::SyncScope _tao_retval = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::SyncScopePolicy::_interface_repository_id (void) const
@@ -325,19 +343,19 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityRange, &_tc_TAO_tc_Messag
 TAO_NAMESPACE_END
 Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::RequestPriorityPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RequestPriorityPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/RequestPriorityPolicy:1.0", env))
     return Messaging::RequestPriorityPolicy::_nil ();
-  return Messaging::RequestPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::RequestPriorityPolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -348,22 +366,33 @@ Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecke
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/RequestPriorityPolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestPriorityPolicy::_nil ());
+    return new Messaging::RequestPriorityPolicy(stub);
   return new POA_Messaging::_tao_collocated_RequestPriorityPolicy(
       ACE_reinterpret_cast(POA_Messaging::RequestPriorityPolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+Messaging::PriorityRange Messaging::RequestPriorityPolicy::priority_range (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    Messaging::PriorityRange _tao_retval;
+    _tao_retval.min = 0;
+    _tao_retval.max = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::RequestPriorityPolicy::_interface_repository_id (void) const
@@ -389,19 +418,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_PRIORITY_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::ReplyPriorityPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/ReplyPriorityPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/ReplyPriorityPolicy:1.0", env))
     return Messaging::ReplyPriorityPolicy::_nil ();
-  return Messaging::ReplyPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::ReplyPriorityPolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -412,22 +441,33 @@ Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_na
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyPriorityPolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyPriorityPolicy::_nil ());
+    return new Messaging::ReplyPriorityPolicy(stub);
   return new POA_Messaging::_tao_collocated_ReplyPriorityPolicy(
       ACE_reinterpret_cast(POA_Messaging::ReplyPriorityPolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+Messaging::PriorityRange Messaging::ReplyPriorityPolicy::priority_range (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    Messaging::PriorityRange _tao_retval;
+    _tao_retval.min = 0;
+    _tao_retval.max = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::ReplyPriorityPolicy::_interface_repository_id (void) const
@@ -453,19 +493,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_START_TIME_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::RequestStartTimePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RequestStartTimePolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/RequestStartTimePolicy:1.0", env))
     return Messaging::RequestStartTimePolicy::_nil ();
-  return Messaging::RequestStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::RequestStartTimePolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -476,22 +516,35 @@ Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchec
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/RequestStartTimePolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestStartTimePolicy::_nil ());
+    return new Messaging::RequestStartTimePolicy(stub);
   return new POA_Messaging::_tao_collocated_RequestStartTimePolicy(
       ACE_reinterpret_cast(POA_Messaging::RequestStartTimePolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+TimeBase::UtcT Messaging::RequestStartTimePolicy::start_time (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    TimeBase::UtcT _tao_retval;
+    _tao_retval.time = 0;
+    _tao_retval.inacclo = 0;
+    _tao_retval.inacchi = 0;
+    _tao_retval.tdf = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::RequestStartTimePolicy::_interface_repository_id (void) const
@@ -517,19 +570,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_END_TIME_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::RequestEndTimePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RequestEndTimePolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/RequestEndTimePolicy:1.0", env))
     return Messaging::RequestEndTimePolicy::_nil ();
-  return Messaging::RequestEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::RequestEndTimePolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -540,22 +593,35 @@ Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/RequestEndTimePolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestEndTimePolicy::_nil ());
+    return new Messaging::RequestEndTimePolicy(stub);
   return new POA_Messaging::_tao_collocated_RequestEndTimePolicy(
       ACE_reinterpret_cast(POA_Messaging::RequestEndTimePolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+TimeBase::UtcT Messaging::RequestEndTimePolicy::end_time (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    TimeBase::UtcT _tao_retval;
+    _tao_retval.time = 0;
+    _tao_retval.inacclo = 0;
+    _tao_retval.inacchi = 0;
+    _tao_retval.tdf = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::RequestEndTimePolicy::_interface_repository_id (void) const
@@ -581,19 +647,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_START_TIME_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::ReplyStartTimePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/ReplyStartTimePolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/ReplyStartTimePolicy:1.0", env))
     return Messaging::ReplyStartTimePolicy::_nil ();
-  return Messaging::ReplyStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::ReplyStartTimePolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -604,22 +670,35 @@ Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyStartTimePolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyStartTimePolicy::_nil ());
+    return new Messaging::ReplyStartTimePolicy(stub);
   return new POA_Messaging::_tao_collocated_ReplyStartTimePolicy(
       ACE_reinterpret_cast(POA_Messaging::ReplyStartTimePolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+TimeBase::UtcT Messaging::ReplyStartTimePolicy::start_time (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    TimeBase::UtcT _tao_retval;
+    _tao_retval.time = 0;
+    _tao_retval.inacclo = 0;
+    _tao_retval.inacchi = 0;
+    _tao_retval.tdf = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::ReplyStartTimePolicy::_interface_repository_id (void) const
@@ -645,19 +724,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_END_TIME_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::ReplyEndTimePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/ReplyEndTimePolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/ReplyEndTimePolicy:1.0", env))
     return Messaging::ReplyEndTimePolicy::_nil ();
-  return Messaging::ReplyEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::ReplyEndTimePolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -668,22 +747,35 @@ Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narr
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyEndTimePolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyEndTimePolicy::_nil ());
+    return new Messaging::ReplyEndTimePolicy(stub);
   return new POA_Messaging::_tao_collocated_ReplyEndTimePolicy(
       ACE_reinterpret_cast(POA_Messaging::ReplyEndTimePolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+TimeBase::UtcT Messaging::ReplyEndTimePolicy::end_time (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    TimeBase::UtcT _tao_retval;
+    _tao_retval.time = 0;
+    _tao_retval.inacclo = 0;
+    _tao_retval.inacchi = 0;
+    _tao_retval.tdf = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::ReplyEndTimePolicy::_interface_repository_id (void) const
@@ -709,19 +801,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_REQ_TIMEOUT_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0", env))
     return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -732,22 +824,31 @@ Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPol
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RelativeRequestTimeoutPolicy::_nil ());
+    return new Messaging::RelativeRequestTimeoutPolicy(stub);
   return new POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy(
       ACE_reinterpret_cast(POA_Messaging::RelativeRequestTimeoutPolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+TimeBase::TimeT Messaging::RelativeRequestTimeoutPolicy::relative_expiry (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    TimeBase::TimeT _tao_retval = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const
@@ -773,19 +874,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_RT_TIMEOUT_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0", env))
     return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -796,22 +897,31 @@ Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeou
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RelativeRoundtripTimeoutPolicy::_nil ());
+    return new Messaging::RelativeRoundtripTimeoutPolicy(stub);
   return new POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy(
       ACE_reinterpret_cast(POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+TimeBase::TimeT Messaging::RelativeRoundtripTimeoutPolicy::relative_expiry (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    TimeBase::TimeT _tao_retval = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const
@@ -865,19 +975,19 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RoutingTypeRange, &_tc_TAO_tc_Mes
 TAO_NAMESPACE_END
 Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::RoutingPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RoutingPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/RoutingPolicy:1.0", env))
     return Messaging::RoutingPolicy::_nil ();
-  return Messaging::RoutingPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::RoutingPolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -888,22 +998,33 @@ Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow (
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/RoutingPolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RoutingPolicy::_nil ());
+    return new Messaging::RoutingPolicy(stub);
   return new POA_Messaging::_tao_collocated_RoutingPolicy(
       ACE_reinterpret_cast(POA_Messaging::RoutingPolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+Messaging::RoutingTypeRange Messaging::RoutingPolicy::routing_range (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    Messaging::RoutingTypeRange _tao_retval;
+    _tao_retval.min = Messaging::ROUTE_NONE;
+    _tao_retval.max = Messaging::ROUTE_NONE;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::RoutingPolicy::_interface_repository_id (void) const
@@ -929,19 +1050,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, MAX_HOPS_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::MaxHopsPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/MaxHopsPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/MaxHopsPolicy:1.0", env))
     return Messaging::MaxHopsPolicy::_nil ();
-  return Messaging::MaxHopsPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::MaxHopsPolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -952,22 +1073,31 @@ Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow (
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/MaxHopsPolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::MaxHopsPolicy::_nil ());
+    return new Messaging::MaxHopsPolicy(stub);
   return new POA_Messaging::_tao_collocated_MaxHopsPolicy(
       ACE_reinterpret_cast(POA_Messaging::MaxHopsPolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::UShort Messaging::MaxHopsPolicy::max_hops (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    CORBA::UShort _tao_retval = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::MaxHopsPolicy::_interface_repository_id (void) const
@@ -993,19 +1123,19 @@ TAO_NAMESPACE_DEFINE (const CORBA::ULong, QUEUE_ORDER_POLICY_TYPE,
 TAO_NAMESPACE_END
 Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::QueueOrderPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/QueueOrderPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/QueueOrderPolicy:1.0", env))
     return Messaging::QueueOrderPolicy::_nil ();
-  return Messaging::QueueOrderPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::QueueOrderPolicy::_unchecked_narrow (obj, env);
 }
 
 Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -1016,22 +1146,31 @@ Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow (
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:Messaging/QueueOrderPolicy:1.0");
   if (servant == 0)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::QueueOrderPolicy::_nil ());
+    return new Messaging::QueueOrderPolicy(stub);
   return new POA_Messaging::_tao_collocated_QueueOrderPolicy(
       ACE_reinterpret_cast(POA_Messaging::QueueOrderPolicy_ptr, servant),
       stub
     );
 }
 
-CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+Messaging::Ordering Messaging::QueueOrderPolicy::allowed_orders (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+    Messaging::Ordering _tao_retval = 0;
+    ACE_UNUSED_ARG (_tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+}
+
+CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::QueueOrderPolicy::_interface_repository_id (void) const
@@ -1236,19 +1375,19 @@ CORBA::TypeCode_ptr Messaging::ExceptionHolder::_tc__tao_seq_Octet = &_tc_TAO_tc
 
 Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::ReplyHandler::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/ReplyHandler:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/ReplyHandler:1.0", env))
     return Messaging::ReplyHandler::_nil ();
-  return Messaging::ReplyHandler::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::ReplyHandler::_unchecked_narrow (obj, env);
 }
 
 Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -1266,14 +1405,14 @@ Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow (
     );
 }
 
-CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyHandler:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!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::ReplyHandler::_interface_repository_id (void) const
@@ -1296,19 +1435,19 @@ TAO_NAMESPACE_END
 
 Messaging::Poller_ptr Messaging::Poller::_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
     return Messaging::Poller::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/Poller:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:Messaging/Poller:1.0", env))
     return Messaging::Poller::_nil ();
-  return Messaging::Poller::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Messaging::Poller::_unchecked_narrow (obj, env);
 }
 
 Messaging::Poller_ptr Messaging::Poller::_unchecked_narrow (
     CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &env
   )
 {
   if (CORBA::is_nil (obj))
@@ -1334,7 +1473,7 @@ CORBA::Object_ptr Messaging::Poller::operation_target (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1382,7 +1521,7 @@ char * Messaging::Poller::operation_name (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1430,7 +1569,7 @@ Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1478,7 +1617,7 @@ void Messaging::Poller::associated_handler (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    ACE_THROW (CORBA::INV_OBJREF ());
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1527,7 +1666,7 @@ CORBA::Boolean Messaging::Poller::is_from_poller (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1575,7 +1714,7 @@ CORBA::Object_ptr Messaging::Poller::target (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1623,7 +1762,7 @@ char * Messaging::Poller::op_name (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index d22e41adf31..c4c14644d9a 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -8,11 +8,11 @@
 //   TAO
 //
 // = FILENAME
-//   MessagingC.h
+//   TimeBaseC.h
 //
 // = DESCRIPTION
-//   Generated from MessagingC.pidl, the CORBA module for the Message
-//   specification.
+//   Generated from TimeBase.pidl, the common time representation for
+//   Time in CORBA.
 //   The code was generated by the IDL compiler and then hand-crafted
 //   to reduce the includes interdependencies.
 //
@@ -35,7 +35,7 @@
 #include "tao/CDR.h"
 #include "tao/TimeBaseC.h"
 #include "tao/PolicyC.h"
-#include "tao/IOPC.h"
+#include "tao/iopfwd.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -177,7 +177,7 @@ TAO_NAMESPACE  Messaging
     virtual RebindMode rebind_mode (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -270,7 +270,7 @@ TAO_NAMESPACE  Messaging
     virtual SyncScope synchronization (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -400,7 +400,7 @@ TAO_NAMESPACE  Messaging
     virtual PriorityRange priority_range (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -493,7 +493,7 @@ TAO_NAMESPACE  Messaging
     virtual PriorityRange priority_range (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -586,7 +586,7 @@ TAO_NAMESPACE  Messaging
     virtual TimeBase::UtcT start_time (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -679,7 +679,7 @@ TAO_NAMESPACE  Messaging
     virtual TimeBase::UtcT end_time (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -772,7 +772,7 @@ TAO_NAMESPACE  Messaging
     virtual TimeBase::UtcT start_time (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -865,7 +865,7 @@ TAO_NAMESPACE  Messaging
     virtual TimeBase::UtcT end_time (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -958,7 +958,7 @@ TAO_NAMESPACE  Messaging
     virtual TimeBase::TimeT relative_expiry (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -1051,7 +1051,7 @@ TAO_NAMESPACE  Messaging
     virtual TimeBase::TimeT relative_expiry (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -1181,7 +1181,7 @@ TAO_NAMESPACE  Messaging
     virtual RoutingTypeRange routing_range (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -1274,7 +1274,7 @@ TAO_NAMESPACE  Messaging
     virtual CORBA::UShort max_hops (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
@@ -1367,7 +1367,7 @@ TAO_NAMESPACE  Messaging
     virtual Ordering allowed_orders (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
-      ) = 0;
+      );
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id,
         CORBA::Environment &env =
diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h
index 3548dbd3a12..60996f4ff44 100644
--- a/TAO/tao/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging_Policy_i.h
@@ -28,9 +28,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_Export TAO_RelativeRoundtripTimeoutPolicy_i : public virtual PortableServer::RefCountServantBase,
-                                                        public virtual POA_Messaging::RelativeRoundtripTimeoutPolicy
-
+class TAO_Export TAO_RelativeRoundtripTimeoutPolicy_i : public POA_Messaging::RelativeRoundtripTimeoutPolicy, public TAO_RefCountServantBase
 {
   // = TITLE
   //   Messaging::RelativeRoundtripTimeoutPolicy implementation
@@ -44,6 +42,9 @@ public:
                                         const TimeBase::TimeT& relative_expiry);
   // Constructor
 
+  TAO_RelativeRoundtripTimeoutPolicy_i (const TAO_RelativeRoundtripTimeoutPolicy_i& rhs);
+  // Copy constructor
+
   static CORBA::Policy_ptr create (
       PortableServer::POA_ptr poa,
       const CORBA::Any& val,
diff --git a/TAO/tao/Messaging_Policy_i.i b/TAO/tao/Messaging_Policy_i.i
index 9b622cfe47d..36cf6fc745f 100644
--- a/TAO/tao/Messaging_Policy_i.i
+++ b/TAO/tao/Messaging_Policy_i.i
@@ -8,3 +8,11 @@ TAO_RelativeRoundtripTimeoutPolicy_i::TAO_RelativeRoundtripTimeoutPolicy_i (
      relative_expiry_ (relative_expiry)
 {
 }
+
+ACE_INLINE
+TAO_RelativeRoundtripTimeoutPolicy_i::TAO_RelativeRoundtripTimeoutPolicy_i (
+    const TAO_RelativeRoundtripTimeoutPolicy_i& rhs)
+  :  poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ())),
+     relative_expiry_ (rhs.relative_expiry_)
+{
+}
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 36306a455a2..c09e062b13f 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -18,6 +18,19 @@ ACE_RCSID(tao, NVList, "$Id$")
 
 // Reference counting for DII Request object
 
+void
+CORBA::release (CORBA::NamedValue_ptr nv)
+{
+  if (nv)
+    nv->_decr_refcnt ();
+}
+
+CORBA::Boolean
+CORBA::is_nil (CORBA::NamedValue_ptr nv)
+{
+  return nv == 0;
+}
+
 CORBA::ULong
 CORBA_NamedValue::_incr_refcnt (void)
 {
@@ -51,6 +64,19 @@ CORBA_NamedValue::~CORBA_NamedValue (void)
 
 // ****************************************************************
 
+void
+CORBA::release (CORBA::NVList_ptr nvl)
+{
+  if (nvl)
+    nvl->_decr_refcnt ();
+}
+
+CORBA::Boolean
+CORBA::is_nil (CORBA::NVList_ptr nvl)
+{
+  return (CORBA::Boolean) (nvl == 0);
+}
+
 CORBA::ULong
 CORBA_NVList::_incr_refcnt (void)
 {
diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i
index 81124ec47a0..d8d0f549a45 100644
--- a/TAO/tao/NVList.i
+++ b/TAO/tao/NVList.i
@@ -1,19 +1,6 @@
 // $Id$
 // This may look like C, but it's really -*- C++ -*-
 
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::NamedValue_ptr nv)
-{
-  return nv == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::NamedValue_ptr nv)
-{
-  if (nv)
-    nv->_decr_refcnt ();
-}
-
 // constructor
 ACE_INLINE
 CORBA_NamedValue::CORBA_NamedValue (void)
@@ -62,19 +49,6 @@ CORBA_NamedValue::_nil (void)
 // Inline operations for class CORBA_NamedValue_var
 // *************************************************************
 
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::NVList_ptr nvl)
-{
-  return (CORBA::Boolean) (nvl == 0);
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::NVList_ptr nvl)
-{
-  if (nvl)
-    nvl->_decr_refcnt ();
-}
-
 ACE_INLINE
 CORBA_NamedValue_var::CORBA_NamedValue_var (void)
   : ptr_ (CORBA_NamedValue::_nil ())
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 2448c06637f..c5c9ccb01eb 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -79,6 +79,19 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_ORB_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+void
+CORBA::release (CORBA::ORB_ptr obj)
+{
+  if (obj)
+    obj->_decr_refcnt ();
+}
+
+CORBA::Boolean
+CORBA::is_nil (CORBA::ORB_ptr obj)
+{
+  return obj == 0;
+}
+
 // = Static initialization.
 
 // Count of the number of ORBs.
@@ -137,15 +150,6 @@ CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
 
 CORBA_ORB::~CORBA_ORB (void)
 {
-  if (!CORBA::is_nil (this->name_service_))
-    CORBA::release (this->name_service_);
-  if (!CORBA::is_nil (this->schedule_service_))
-    CORBA::release (this->schedule_service_);
-  if (!CORBA::is_nil (this->event_service_))
-    CORBA::release (this->event_service_);
-  if (!CORBA::is_nil (this->trading_service_))
-    CORBA::release (this->trading_service_);
-
   this->orb_core_->fini ();
 
   ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, tao_mon, *ACE_Static_Object_Lock::instance ()));
@@ -164,6 +168,14 @@ CORBA_ORB::~CORBA_ORB (void)
   delete this->shutdown_lock_;
   this->shutdown_lock_ = 0;
 
+  if (!CORBA::is_nil (this->name_service_))
+    CORBA::release (this->name_service_);
+  if (!CORBA::is_nil (this->schedule_service_))
+    CORBA::release (this->schedule_service_);
+  if (!CORBA::is_nil (this->event_service_))
+    CORBA::release (this->event_service_);
+  if (!CORBA::is_nil (this->trading_service_))
+    CORBA::release (this->trading_service_);
 # ifdef TAO_HAS_VALUETYPE
   // delete valuetype_factory_map_;
   // not really, its a singleton
@@ -1279,10 +1291,9 @@ CORBA::ORB_init (int &argc,
         {
           char *current_arg = arg_shifter.get_current ();
 
-          const char orbid_opt[] = "-ORBId";
+          const char orbid_opt[] = "-ORBid";
           const int orbid_len = sizeof (orbid_opt) - 1;
-          if (ACE_OS::strcmp (current_arg,
-                              orbid_opt) == 0)
+          if (ACE_OS::strcmp (current_arg, orbid_opt) == 0)
             {
               arg_shifter.consume_arg ();
               if (arg_shifter.is_parameter_next ())
@@ -1363,10 +1374,6 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
 
       // @@ 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));
-#endif /* ACE_HAS_PURIFY */
-
       TAO_OutputCDR cdr (buf,  sizeof buf,
                          TAO_ENCAP_BYTE_ORDER,
                          this->orb_core_->output_cdr_buffer_allocator (),
@@ -1455,8 +1462,8 @@ CORBA_ORB::string_to_object (const char *str,
       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
+      // 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,
@@ -1646,9 +1653,9 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj)
     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!
+  // @@ Fred: why do we need an environment for the
+  //    Profile::_key() method?
+  // @@ No good reason, I will fix.
 
   CORBA::Environment ACE_TRY_ENV;
 
@@ -1668,6 +1675,9 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj)
            i != end;
            ++i)
         {
+          // @@ Fred&Ossama: how do we handle forwarding in this case?
+          //    What happens if we are forwarded back to this ORB, or if a
+          //    local stub is (or should) be forwarded to a remote one?
 
           const TAO_MProfile& mprofile = sobj->get_base_profiles ();
           if ((*i).int_id_->is_collocated (mprofile) == 0)
@@ -1680,7 +1690,7 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj)
                ++j)
             {
               const TAO_Profile* profile = mprofile.get_profile (j);
-              TAO_ObjectKey_var objkey = profile->_key ();
+              TAO_ObjectKey_var objkey = profile->_key (ACE_TRY_ENV);
               ACE_CHECK_RETURN (0);
 
               ACE_TRY
@@ -1689,9 +1699,6 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj)
                     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
@@ -1705,6 +1712,10 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj)
     }
   else
     {
+      // @@ Fred&Ossama: how do we handle forwarding in this case?
+      //    What happens if we are forwarded back to this ORB, or if a
+      //    local stub is (or should) be forwarded to a remote one?
+
       const TAO_MProfile& mprofile = sobj->get_base_profiles ();
       if (!this->orb_core_->is_collocated (mprofile))
         return 0;
@@ -1719,7 +1730,7 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj)
            ++j)
         {
           const TAO_Profile* profile = mprofile.get_profile (j);
-          TAO_ObjectKey_var objkey = profile->_key ();
+          TAO_ObjectKey_var objkey = profile->_key (ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
 
           ACE_TRY_EX(LOCAL_ORB)
@@ -1728,11 +1739,6 @@ CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj)
                 oa->find_servant (objkey.in (), ACE_TRY_ENV);
               ACE_TRY_CHECK_EX(LOCAL_ORB);
 
-              // Found collocated object.  Perhaps we can get around by simply
-              // setting the servant_orb, but let get this to work first.
-
-              // There could only be one ORB which is us.
-              sobj->servant_orb (CORBA::ORB::_duplicate (this));
               return servant;
             }
           ACE_CATCHANY
@@ -1756,8 +1762,7 @@ CORBA_ORB::_tao_add_to_IOR_table (const ACE_CString &object_id,
 {
   if (CORBA::is_nil (obj))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO (%P|%t): Cannot add nil object to table <%s>\n",
-                       object_id.c_str ()),
+                       "Unable to add IOR to table\n"),
                       -1);
 
   CORBA::String_var string =
@@ -1770,8 +1775,7 @@ CORBA_ORB::_tao_add_to_IOR_table (const ACE_CString &object_id,
 
   if (this->lookup_table_.add_ior (object_id, ior) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO (%P|%t): Unable to add IOR to table <%s>\n",
-                       object_id.c_str ()),
+                       "Unable to add IOR to table\n"),
                       -1);
 
   return 0;
@@ -1790,8 +1794,7 @@ CORBA_ORB::_tao_find_in_IOR_table (const ACE_CString &object_id,
 
   if (this->lookup_table_.find_ior (object_id, ior) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO (%P|%t) cannot find IOR for <%s>\n",
-                       object_id.c_str ()),
+                       "No match for the given ObjectID\n"),
                       -1);
 
   obj = this->string_to_object (ior.c_str ());
@@ -1829,7 +1832,6 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x)
   cdr.read_octet_array (x.get_buffer (), length);
 #else
   x.replace (length, cdr.start ());
-  x.mb ()->wr_ptr (x.mb ()->rd_ptr () + length);
   cdr.skip_bytes (length);
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES */
   return cdr.good_bit ();
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 3b398cabbd0..06ace06bd1f 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -50,6 +50,16 @@ typedef enum
 # pragma option -a                // BC++, use 1 byte alignment
 #endif
 
+#if !defined (TAO_CONST)
+// Something to document the fact that we want to put 'const' in front
+// of a type, but that it won't turn out the way we want, e.g., we
+// really want to express that a CORBA_String is const, but since
+// CORBA_String is a char*, the const modifies the pointer and not the
+// pointed-to, and some compilers (like SGI's EDG-derived thang)
+// complain.
+#define TAO_CONST
+#endif /* TAO_CONST */
+
 // Forward declarations of some data types are needed.
 
 class TAO_POA_Manager;
@@ -448,6 +458,12 @@ public:
   CORBA::Boolean poll_next_response (CORBA_Environment &ACE_TRY_ENV =
                                      TAO_default_environment ());
 
+  // = New Things from the POA Specification
+  //
+  // Of all of these operations, only <run> is currently implemented.
+  // Others require clarification of design or more implementation
+  // than is currently available.
+
   CORBA::Boolean work_pending (void);
   // Returns an indication of whether the ORB needs to perform some
   // work.
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
index 0b5baf8ecde..aa4193884ce 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -322,23 +322,6 @@ CORBA_ORB::orb_core (void) const
   return this->orb_core_;
 }
 
-// ************************************************************
-// These are in CORBA namespace
-// ************************************************************
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::ORB_ptr obj)
-{
-  return obj == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::ORB_ptr obj)
-{
-  if (obj)
-    obj->_decr_refcnt ();
-}
-
 // *************************************************************
 // Inline operations for class CORBA_ORB_var
 // *************************************************************
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index cf49f5d931f..7a637c44276 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -20,9 +20,6 @@
 #include "tao/Connector_Registry.h"
 #include "tao/Acceptor_Registry.h"
 
-#include "tao/POA.h"
-
-#include "ace/Object_Manager.h"
 #include "ace/Env_Value_T.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
@@ -34,12 +31,15 @@
 
 ACE_RCSID(tao, ORB_Core, "$Id$")
 
+typedef ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX>
+        TAO_ORB_CORE_TSS_RESOURCES;
+
 // ****************************************************************
 
 CORBA::Environment &
 TAO_default_environment ()
 {
-  return *TAO_TSS_RESOURCES::instance ()->default_environment_;
+  return *TAO_ORB_CORE_TSS_RESOURCES::instance ()->default_environment_;
 }
 
 // ****************************************************************
@@ -65,7 +65,6 @@ TAO_ORB_Core::TAO_ORB_Core (const char* orbid)
     //    is staticaly added to the service configurator.
     opt_for_collocation_ (1),
     use_global_collocation_ (1),
-    collocation_strategy_ (THRU_POA),
     poa_current_ (0),
     object_adapter_ (0),
     tm_ (),
@@ -99,12 +98,6 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
 
   delete this->from_iso8859_;
   delete this->to_iso8859_;
-
-  if (this->reactor_ != 0)
-    {
-      delete this->reactor_;
-      this->reactor_ = 0;
-    }
 }
 
 int
@@ -231,22 +224,11 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   int dotted_decimal_addresses = 0;
 #endif /* TAO_USE_DOTTED_DECIMAL_ADDRESSES */
 
-#if defined (TAO_STD_PROFILE_COMPONENTS)
-  int std_profile_components = 1;
-#else
-  int std_profile_components = 0;
-#endif /* TAO_STD_PROFILE_COMPONENTS */
-
-  int use_tss_resources = -1;
-  // -1 is unknown, default to what the resource factory sets.
-  // @@ This is just for backwards compatibility.
-
   while (arg_shifter.is_anything_left ())
     {
       char *current_arg = arg_shifter.get_current ();
 
-      if (ACE_OS::strcasecmp (current_arg,
-                              "-ORBSvcConf") == 0)
+      if (ACE_OS::strcmp (current_arg, "-ORBsvcconf") == 0)
         {
           // Specify the name of the svc.conf file to be used.
           svc_config_argv[svc_config_argc++] =
@@ -260,18 +242,14 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg();
             }
         }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDaemon") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBdaemon") == 0)
         {
           // Be a daemon
           svc_config_argv[svc_config_argc++] =
             CORBA::string_dup ("-b");
           arg_shifter.consume_arg ();
         }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDottedDecimalAddresses") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBdotteddecimaladdresses") == 0)
         {
           // Use dotted decimal addresses
           // @@ this should be renamed.  See above comment. fredk
@@ -282,17 +260,14 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDebug") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBdebug") == 0)
         {
           // Turn on debugging
           ACE::debug (1);
           TAO_orbdebug = 1;
           arg_shifter.consume_arg ();
         }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDebugLevel") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBdebuglevel") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -304,8 +279,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBEndpoint") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBendpoint") == 0)
         {
           // Each "endpoint" is of the form:
           //
@@ -345,8 +319,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBHost") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBhost") == 0)
         {
           // @@ Fred&Carlos: This option now has the same effect as specifying
           //                 an extra -ORBendpoint.  Ideally, this option
@@ -373,8 +346,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBNameServiceIOR") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBnameserviceior") == 0)
         {
           // Specify the IOR of the NameService.
 
@@ -385,8 +357,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBNameServicePort") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBnameserviceport") == 0)
         {
           // Specify the port number for the NameService.
           // Unrelated to ORB Protocols, this is used for multicast.
@@ -398,8 +369,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBTradingServiceIOR") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBtradingserviceior") == 0)
         {
           // Specify the IOR of the NameService.
 
@@ -410,8 +380,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBTradingServicePort") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBtradingserviceport") == 0)
         {
           // Specify the port number for the NameService.
 
@@ -422,16 +391,15 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBPort") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBport") == 0)
         {
           // Issue a warning since this backward compatibilty support
           // may be dropped in future releases.
 
           old_style_endpoint = 1;
           ACE_DEBUG ((LM_WARNING,
-                      "(%P|%t) \nWARNING: The `-ORBPort' option is obsolete.\n"
-                      "In the future, use the `-ORBEndpoint' option.\n"));
+                      "(%P|%t) \nWARNING: The `-ORBport' option is obsolete.\n"
+                      "In the future, use the `-ORBendpoint' option.\n"));
 
           // Specify the port number/name on which we should listen
           arg_shifter.consume_arg ();
@@ -443,8 +411,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBRcvSock") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBrcvsock") == 0)
         {
           // @@ All protocol implementation may not use sockets, so
           //    this can either be a generic I/O Buffer size or
@@ -459,8 +426,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBSndSock") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBsndsock") == 0)
         {
           // @@ All protocol implementation may not use sockets, so
           //    this can either be a generic I/O Buffer size or
@@ -474,8 +440,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBObjRefStyle") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBobjrefstyle") == 0)
         {
           // Specifies the style of printed objrefs: URL or IOR
           //
@@ -500,16 +465,14 @@ 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,
-                                      "URL") == 0)
+              if (ACE_OS::strcasecmp (opt, "URL") == 0)
                 use_ior = 0;
 
               arg_shifter.consume_arg ();
             }
         }
 
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBCollocation") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBcollocation") == 0)
         // Specify whether we want to optimize against collocation
         // objects.  Valid arguments are: "yes" and "no".  Default is
         // yes.
@@ -518,40 +481,20 @@ 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)
+              if (ACE_OS::strcasecmp (opt, "YES") == 0)
                 this->opt_for_collocation_ = 1;
-              else if (ACE_OS::strcasecmp (opt,
-                                           "NO") == 0)
+              else if (ACE_OS::strcasecmp (opt, "NO") == 0)
                 this->opt_for_collocation_ = 0;
 
               arg_shifter.consume_arg ();
             }
         }
 
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBCollocationStrategy") == 0)
-        // Specify which collocation policy we want to use.
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "thru_poa") == 0)
-                this->collocation_strategy_ = THRU_POA;
-              else if (ACE_OS::strcasecmp (opt, "direct") == 0)
-                this->collocation_strategy_ = DIRECT;
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
       // @@ 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)
+      else if (ACE_OS::strcmp (current_arg, "-ORBglobalcollocation") == 0)
         // Specify whether we want to use collocation across ORBs;
         // i.e. all the ORBs in the same address space use collocated
         // calls.
@@ -560,19 +503,16 @@ 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)
+              if (ACE_OS::strcasecmp (opt, "YES") == 0)
                 this->use_global_collocation_ = 1;
-              else if (ACE_OS::strcasecmp (opt,
-                                           "NO") == 0)
+              else if (ACE_OS::strcasecmp (opt, "NO") == 0)
                 this->use_global_collocation_ = 0;
 
               arg_shifter.consume_arg ();
             }
         }
 
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBPreconnect") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBpreconnect") == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -625,8 +565,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
             }
         }
 
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBCDRTradeoff") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBcdrtradeoff") == 0)
         {
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
@@ -635,9 +574,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-
-       else if (ACE_OS::strcasecmp (current_arg,
-                                    "-ORBSvcConfDirective") == 0)
+       else if (ACE_OS::strcmp (current_arg, "-ORBsvcconfdirective") == 0)
          {
            // This is used to pass arguments to the Service
            // Configurator using the "command line" to provide
@@ -655,9 +592,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
                arg_shifter.consume_arg ();
              }
          }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBGIOPlite") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBgioplite") == 0)
         {
           // @@ This will have to change since gioplite will be considered
           //    as an alternate ORB messaging protocols.
@@ -668,24 +603,20 @@ TAO_ORB_Core::init (int &argc, char *argv[])
       // A new <ObjectID>:<IOR> mapping has been specified. This will be
       // used by the resolve_initial_references ().
 
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBInitRef") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBInitRef") == 0)
         {
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
             {
               init_ref = arg_shifter.get_current ();
-              if (this->add_to_ior_table (init_ref,
-                                          *ior_lookup_table) != 0)
+              if (this->add_to_ior_table (init_ref,*ior_lookup_table) != 0)
                 ACE_ERROR_RETURN ((LM_ERROR,
                                    "Unable to add IOR to the Table\n"),
                                   -1);
               arg_shifter.consume_arg ();
             }
         }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBDefaultInitRef") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBDefaultInitRef") == 0)
         {
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
@@ -694,55 +625,12 @@ TAO_ORB_Core::init (int &argc, char *argv[])
               arg_shifter.consume_arg ();
             }
         }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBSkipServiceConfigOpen") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBSkipServiceConfigOpen") == 0)
         {
           arg_shifter.consume_arg ();
           skip_service_config_open = 1;
         }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBStdProfileComponents") == 0)
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              std_profile_components =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-           }
-        }
-
-      else if (ACE_OS::strcasecmp (current_arg,
-                                   "-ORBResources") == 0)
-        {
-          arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              char *opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "global") == 0)
-                use_tss_resources = 0;
-              else if (ACE_OS::strcasecmp (opt, "tss") == 0)
-                use_tss_resources = 1;
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strncasecmp (current_arg,
-                                    "-ORB",
-                                    4) == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "warning: unknown -ORB arg %s, consuming arg\n",
-                       current_arg));
-          arg_shifter.consume_arg ();
-        }
       else
-        // Any arguments that don't match are ignored so that the
-        // caller can still use them.
         arg_shifter.ignore_arg ();
     }
 
@@ -811,8 +699,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
                        "ORB Core unable to find a Resource Factory instance"),
                       -1);
 
-  (void) this->reactor ();
-  // Make sure the reactor is initialized...
+  this->reactor (trf->get_reactor ());
 
   TAO_Server_Strategy_Factory *ssf = this->server_factory ();
 
@@ -881,7 +768,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
 
   this->orb_params ()->use_lite_protocol (giop_lite);
 
-  this->orb_params ()->std_profile_components (std_profile_components);
+  this->orb_params ()->use_dotted_decimal_addresses (dotted_decimal_addresses);
 
   // ** Set up the pluggable protocol infrastructure.  First get a
   // pointer to the protocol factories set, then obtain pointers to
@@ -905,11 +792,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   if (this->orb_params ()->preconnects ().is_empty () == 0)
     this->connector_registry ()->preconnect (this->orb_params ()->preconnects ());
 
-  if (use_tss_resources == -1)
-    this->use_tss_resources_ = 0; // @@ What is the default?
-  else
-    this->use_tss_resources_ = use_tss_resources;
-
   return 0;
 }
 
@@ -1042,6 +924,7 @@ TAO_ORB_Core::resource_factory (void)
 
       // @@ Not needed.
       this->resource_factory_from_service_config_ = 0;
+      default_factory->resource_source (TAO_Default_Resource_Factory::TAO_GLOBAL);
       this->resource_factory_ = default_factory;
 
       // @@ At this point we need to register this with the
@@ -1164,24 +1047,9 @@ TAO_ORB_Core::inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resour
   // Inherit properties/objects used in ORB_Core from the
   // parent thread.  Stuff inherited here must already exist
   // in the "parent" orbcore.
-  // This is used in the thread-per-connection concurrency model where
-  // each ORB spawned thread must use the resources of the spawning
-  // thread...
 
-  if (tss_resources->reactor_ != 0)
-    {
-      // We'll use the spawning thread's reactor.
-      TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
-      if (tss->reactor_ != 0 && TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO (%P|%t) - non nil reactor on thread startup!\n"));
-          if (tss->owns_reactor_ != 0)
-            delete tss->reactor_;
-        }
-      tss->reactor_ = tss_resources->reactor_;
-      tss->owns_reactor_ = 0;
-    }
+  this->reactor (tss_resources->reactor_);
+  // We'll use the spawning thread's reactor.
 
   // this->connection_cache (tss_resources->connection_cache_);
   // Inherit connection cache?
@@ -1251,17 +1119,6 @@ TAO_ORB_Core::is_collocated (const TAO_MProfile& mprofile)
   if (this->acceptor_registry_ == 0)
     return 0;
 
-  // @@ Lots of issues arrise when dealing with collocation.  What about
-  //    forwarding or what if this is a multi-profile IOR where the order is
-  //    significant and only one of the profiles is collocated.  For example
-  //    when using a multiple servers for fault tolerance.  For now, we just
-  //    look through all profiles and if any are colocated then we assume
-  //    the object is collocated.
-  // @@ Note, if collocated we can not be forwarded!
-  //    Also, acceptor_registry_->is_collocated (...) will check the
-  //    address (ORB Host) but not the object_key.  This should be checked
-  //    also.
-
   return this->acceptor_registry_->is_collocated (mprofile);
 }
 
@@ -1412,51 +1269,34 @@ TAO_ORB_Core::input_cdr_buffer_allocator (void)
 ACE_Allocator*
 TAO_ORB_Core::output_cdr_dblock_allocator (void)
 {
-  TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
-
-  if (tss->output_cdr_dblock_allocator_ == 0)
-    {
-      tss->output_cdr_dblock_allocator_ =
-        this->resource_factory ()->output_cdr_dblock_allocator ();
-    }
-
-  return tss->output_cdr_dblock_allocator_;
+  return this->resource_factory ()->output_cdr_dblock_allocator ();
 }
 
 ACE_Allocator*
 TAO_ORB_Core::output_cdr_buffer_allocator (void)
 {
-  TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
+  return this->resource_factory ()->output_cdr_buffer_allocator ();
+}
 
-  if (tss->output_cdr_buffer_allocator_ == 0)
-    {
-      tss->output_cdr_buffer_allocator_ =
-        this->resource_factory ()->output_cdr_dblock_allocator ();
-    }
+ACE_Reactor *
+TAO_ORB_Core::reactor (ACE_Reactor *r)
+{
+  TAO_ORB_Core_TSS_Resources *tss =
+    TAO_ORB_CORE_TSS_RESOURCES::instance ();
 
-  return tss->output_cdr_buffer_allocator_;
+  ACE_Reactor *old_reactor = tss->reactor_;
+  tss->reactor_ = r;
+  return old_reactor;
 }
 
 ACE_Reactor *
 TAO_ORB_Core::reactor (void)
 {
-  TAO_ORB_Core_TSS_Resources* tss = this->get_tss_resources ();
+  TAO_ORB_Core_TSS_Resources *tss =
+    TAO_ORB_CORE_TSS_RESOURCES::instance ();
 
   if (tss->reactor_ == 0)
-    {
-      if (this->use_tss_resources_)
-        {
-          tss->reactor_ = this->resource_factory ()->get_reactor ();
-          tss->owns_reactor_ = 1;
-        }
-      else if (this->reactor_ == 0)
-        {
-          // @@ Double checked locking!
-          this->reactor_ =
-            this->resource_factory ()->get_reactor ();
-        }
-      tss->reactor_ = this->reactor_;
-    }
+    tss->reactor_ = this->resource_factory ()->get_reactor ();
 
   return tss->reactor_;
 }
@@ -1470,13 +1310,13 @@ TAO_ORB_Core::poa_current (void) const
 CORBA_Environment*
 TAO_ORB_Core::default_environment (void) const
 {
-  return TAO_TSS_RESOURCES::instance ()->default_environment_;
+  return TAO_ORB_CORE_TSS_RESOURCES::instance ()->default_environment_;
 }
 
 void
 TAO_ORB_Core::default_environment (CORBA_Environment* env)
 {
-  TAO_TSS_RESOURCES::instance ()->default_environment_ = env;
+  TAO_ORB_CORE_TSS_RESOURCES::instance ()->default_environment_ = env;
 }
 
 #if defined (TAO_HAS_CORBA_MESSAGING)
@@ -1492,57 +1332,34 @@ TAO_ORB_Core::policy_current (void)
 // ****************************************************************
 
 TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
-  :  owns_reactor_ (0),
-     reactor_ (0),
+  :  reactor_ (0),
+     poa_current_impl_ (0),
+     default_environment_ (&this->tss_environment_),
+#if defined (TAO_HAS_CORBA_MESSAGING)
+     policy_current_ (&this->initial_policy_current_),
+#endif /* TAO_HAS_CORBA_MESSAGING */
      output_cdr_dblock_allocator_ (0),
      output_cdr_buffer_allocator_ (0),
-     output_cdr_msgblock_allocator_ (0),
-     owns_connection_cache_ (0),
      connection_cache_ (0)
 {
 }
 
 TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void)
 {
-  if (this->owns_reactor_)
+  if (this->output_cdr_dblock_allocator_ != 0)
     {
-      delete this->reactor_;
-      this->reactor_ = 0;
-      this->owns_reactor_ = 0;
+      delete this->output_cdr_dblock_allocator_;
+      this->output_cdr_dblock_allocator_ = 0;
     }
-
-  delete this->output_cdr_dblock_allocator_;
-  this->output_cdr_dblock_allocator_ = 0;
-  delete this->output_cdr_buffer_allocator_;
-  this->output_cdr_buffer_allocator_ = 0;
-  delete this->output_cdr_msgblock_allocator_;
-  this->output_cdr_msgblock_allocator_ = 0;
-
-  if (this->owns_connection_cache_)
+  if (this->output_cdr_buffer_allocator_ != 0)
     {
-      // unimplemented delete this->connection_cache_;
-      this->connection_cache_ = 0;
-      this->owns_connection_cache_ = 0;
+      delete this->output_cdr_buffer_allocator_;
+      this->output_cdr_buffer_allocator_ = 0;
     }
 }
 
 // ****************************************************************
 
-TAO_TSS_Resources::TAO_TSS_Resources (void)
-  :  poa_current_impl_ (0),
-     default_environment_ (&this->tss_environment_)
-#if defined (TAO_HAS_CORBA_MESSAGING)
-     , policy_current_ (&this->initial_policy_current_)
-#endif /* TAO_HAS_CORBA_MESSAGING */
-{
-}
-
-TAO_TSS_Resources::~TAO_TSS_Resources (void)
-{
-}
-
-// ****************************************************************
-
 TAO_ORB_Table::TAO_ORB_Table (void)
 {
 }
@@ -1574,24 +1391,21 @@ int
 TAO_ORB_Table::bind (const char* orb_id,
                      TAO_ORB_Core* orb_core)
 {
-  ACE_CString id (orb_id);
-  return this->table_.bind (id, orb_core);
+  return this->table_.bind (orb_id, orb_core);
 }
 
 TAO_ORB_Core*
 TAO_ORB_Table::find (const char* orb_id)
 {
   TAO_ORB_Core* found = 0;
-  ACE_CString id (orb_id);
-  this->table_.find (id, found);
+  this->table_.find (orb_id, found);
   return found;
 }
 
 int
 TAO_ORB_Table::unbind (const char* orb_id)
 {
-  ACE_CString id (orb_id);
-  return this->table_.unbind (id);
+  return this->table_.unbind (orb_id);
 }
 
 // ****************************************************************
@@ -1630,8 +1444,7 @@ TAO_ORB_Core_instance (void)
 template class ACE_Env_Value<int>;
 template class ACE_Env_Value<u_int>;
 
-template class ACE_TSS_Singleton<TAO_TSS_Resources, ACE_SYNCH_MUTEX>;
-template class ACE_TSS<TAO_TSS_Resources>;
+template class ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX>;
 template class ACE_TSS<TAO_ORB_Core_TSS_Resources>;
 
 template class ACE_Read_Guard<ACE_SYNCH_MUTEX>;
@@ -1653,8 +1466,7 @@ template class ACE_Map_Reverse_Iterator<ACE_CString,TAO_ORB_Core*,ACE_Null_Mutex
 #pragma instantiate ACE_Env_Value<int>
 #pragma instantiate ACE_Env_Value<u_int>
 
-#pragma instantiate ACE_TSS_Singleton<TAO_TSS_Resources, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS<TAO_TSS_Resources>
+#pragma instantiate ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_TSS<TAO_ORB_Core_TSS_Resources>
 
 #pragma instantiate ACE_Read_Guard<ACE_SYNCH_MUTEX>
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index f94c7c8118e..1af3a99e090 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -23,7 +23,6 @@
 #include "tao/Resource_Factory.h"
 #include "tao/params.h"
 #include "tao/POAC.h"
-#include "tao/GIOP.h"
 
 #include "ace/Map_Manager.h"
 #include "ace/Singleton.h"
@@ -43,50 +42,7 @@ class TAO_Resource_Factory;
 class TAO_Client_Strategy_Factory;
 class TAO_Server_Strategy_Factory;
 class TAO_Connection_Cache;
-class TAO_TSS_Resources;
-
-// ****************************************************************
-
-class TAO_Export TAO_ORB_Core_TSS_Resources
-{
-  // = TITLE
-  //   The TSS resoures of an ORB core.
-  //
-  // = DESCRIPTION
-  //   This class is used by the ORB_Core to store the resources
-  //   potentially bound to a thread in TSS storage.
-  //   The members are public because only the ORB Core is expected to
-  //   access them.
-  //
-public:
-  TAO_ORB_Core_TSS_Resources (void);
-  // constructor
-
-  ~TAO_ORB_Core_TSS_Resources (void);
-  // destructor
-
-  int owns_reactor_;
-  // Set to 1 if this object owns the reactor
-
-  ACE_Reactor *reactor_;
-  // Used for responding to I/O reactively
-
-  // = The rest of the resources are not currently in use, just a plan
-  //   for the future...
-
-  ACE_Allocator *output_cdr_dblock_allocator_;
-  ACE_Allocator *output_cdr_buffer_allocator_;
-  ACE_Allocator *output_cdr_msgblock_allocator_;
-  // The allocators for the output CDR streams.
-
-  int owns_connection_cache_;
-  // Set to 1 if this object owns the connection cache
-
-  TAO_Connection_Cache *connection_cache_;
-  // This is is just a place holder, in the future the connection
-  // cache will be separated from the connectors and it will be a
-  // (potentially) TSS object.
-};
+class TAO_ORB_Core_TSS_Resources;
 
 // ****************************************************************
 
@@ -139,6 +95,7 @@ public:
   CORBA::ORB_ptr orb (void);
 
   // = Set/get the <ACE_Reactor>.
+  ACE_Reactor *reactor (ACE_Reactor *r);
   ACE_Reactor *reactor (void);
 
   // = Set/get the <ACE_Thread_Manager>.
@@ -154,13 +111,6 @@ public:
                                               TAO_POA_Manager *poa_manager = 0,
                                               const TAO_POA_Policies *policies = 0);
 
-  // = Collocation strategies.
-  enum {
-    ORB_CONTROL,                // Indicate object should refer to ORB for either one of the following strategies.
-    THRU_POA,                   // Collocated calls will go thru POA.
-    DIRECT                      // Collocated calls invoke operation on Servant directly.
-  };
-
   // = Get the default codeset translators.
   //   In most configurations these are just <nil> objects, but they
   //   can be set to something different if the native character sets
@@ -178,9 +128,6 @@ public:
   ACE_WChar_Codeset_Translator *to_unicode (void) const;
   // Convert from the native wide character set to UNICODE
 
-  TAO_GIOP_ServiceContextList& service_context (void);
-  // Obtain the service context list used to send requests...
-
   // @@ This is just note on how could the translator database be
   //    implemented: use the service configurator to load the
   //    translator, and then use the CodesetId (an unsigned long) to
@@ -204,11 +151,13 @@ public:
   void optimize_collocation_objects (CORBA::Boolean opt);
   CORBA::Boolean optimize_collocation_objects (void) const;
 
+  // just an alias for the previous two methods, should be removed.
+  void using_collocation (CORBA::Boolean opt);
+  CORBA::Boolean using_collocation (void) const;
+
   void use_global_collocation (CORBA::Boolean opt);
   CORBA::Boolean use_global_collocation (void) const;
 
-  CORBA::ULong get_collocation_strategy (void) const;
-
   TAO_Object_Adapter *object_adapter (void);
   // Get <Object Adapter>.
 
@@ -342,9 +291,6 @@ public:
       default_relative_roundtrip_timeout (void) const;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
-  TAO_ORB_Core_TSS_Resources* get_tss_resources (void);
-  // Obtain the TSS resources of this orb.
-
 protected:
   int set_iiop_endpoint (int dotted_decimal_addresses,
                          CORBA::UShort port,
@@ -440,9 +386,6 @@ protected:
   // TRUE if we want to consider all ORBs in this address space
   // collocated.
 
-  CORBA::ULong collocation_strategy_;
-  // Default collocation policy.  This should never be ORB_CONTROL.
-
 #if defined (TAO_HAS_CORBA_MESSAGING)
   TAO_Policy_Manager policy_manager_;
   // The Policy_Manager for this ORB.
@@ -472,44 +415,31 @@ protected:
   ACE_WChar_Codeset_Translator *from_unicode_;
   ACE_WChar_Codeset_Translator *to_unicode_;
   // Codeset translators for simple implementations.
-
-  int use_tss_resources_;
-  // If 1 then this ORB uses thread-specific resources
-
-  ACE_Reactor* reactor_;
-  // If the ORB has a single reactor shared between all the threads
-  // then this is it....
-
-  ACE_TSS_TYPE (TAO_ORB_Core_TSS_Resources) tss_resources_;
-  // This is where the tss resources for this ORB are stored.
-
-  // @@ TODO: the service context list may need to be in TSS
-  //    storage...
-  // NOTE: this is only used to *send* requests, not to store the
-  // service context list of a reply...
-  TAO_GIOP_ServiceContextList service_context_;
 };
 
 // ****************************************************************
 
-class TAO_Export TAO_TSS_Resources
+class TAO_Export TAO_ORB_Core_TSS_Resources
 {
   // = TITLE
-  //   The TSS resoures shared by all the ORBs
+  //   The TSS resoures of an ORB core.
   //
   // = DESCRIPTION
-  //   This class is used by TAO to store the resources that are
-  //   thread-specific but are *not* ORB specific...
+  //   This class is used by the ORB_Core to store the resources
+  //   potentially bound to a thread in TSS storage.
   //   The members are public because only the ORB Core is expected to
   //   access them.
   //
 public:
-  TAO_TSS_Resources (void);
+  TAO_ORB_Core_TSS_Resources (void);
   // constructor
 
-  ~TAO_TSS_Resources (void);
+  ~TAO_ORB_Core_TSS_Resources (void);
   // destructor
 
+  ACE_Reactor *reactor_;
+  // Used for responding to I/O reactively
+
   TAO_POA_Current_Impl *poa_current_impl_;
   // Points to structure containing state for the current upcall
   // context in this thread.  Note that it does not come from the
@@ -534,14 +464,22 @@ public:
   TAO_Policy_Current_Impl *policy_current_;
   // This pointer is reset by the POA on each upcall.
 #endif /* TAO_HAS_CORBA_MESSAGING */
-};
 
-// @@ Must go away....
-typedef ACE_TSS_Singleton<TAO_TSS_Resources, ACE_SYNCH_MUTEX>
-        TAO_TSS_RESOURCES;
+  ACE_Allocator *output_cdr_dblock_allocator_;
+  ACE_Allocator *output_cdr_buffer_allocator_;
+  // The allocators for the output CDR streams.
+
+  TAO_Connection_Cache *connection_cache_;
+  // This is is just a place holder, in the future the connection
+  // cache will be separated from the connectors and it will be a
+  // (potentially) TSS object.
+};
 
 // ****************************************************************
 
+typedef ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX>
+        TAO_ORB_CORE_TSS_RESOURCES;
+
 class TAO_Export TAO_ORB_Table
 {
   // = TITLE
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index b8855541e36..9c130c65ee3 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -43,6 +43,18 @@ TAO_ORB_Core::optimize_collocation_objects (void) const
 }
 
 ACE_INLINE void
+TAO_ORB_Core::using_collocation (CORBA::Boolean b)
+{
+  this->optimize_collocation_objects (b);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_ORB_Core::using_collocation (void) const
+{
+  return this->optimize_collocation_objects ();
+}
+
+ACE_INLINE void
 TAO_ORB_Core::use_global_collocation (CORBA::Boolean opt)
 {
   this->use_global_collocation_ = opt;
@@ -54,12 +66,6 @@ TAO_ORB_Core::use_global_collocation (void) const
   return this->use_global_collocation_;
 }
 
-ACE_INLINE CORBA::ULong
-TAO_ORB_Core::get_collocation_strategy (void) const
-{
-  return this->collocation_strategy_;
-}
-
 ACE_INLINE
 TAO_ORB_Parameters *
 TAO_ORB_Core::orb_params(void)
@@ -114,12 +120,6 @@ TAO_ORB_Core::to_unicode (void) const
   return this->to_unicode_;
 }
 
-ACE_INLINE TAO_GIOP_ServiceContextList&
-TAO_ORB_Core::service_context (void)
-{
-  return this->service_context_;
-}
-
 ACE_INLINE ACE_Data_Block*
 TAO_ORB_Core::create_input_cdr_data_block (size_t size)
 {
@@ -149,12 +149,6 @@ TAO_ORB_Core::default_relative_roundtrip_timeout (void) const
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
-ACE_INLINE TAO_ORB_Core_TSS_Resources*
-TAO_ORB_Core::get_tss_resources (void)
-{
-  return ACE_TSS_GET (&this->tss_resources_,TAO_ORB_Core_TSS_Resources);
-}
-
 // ****************************************************************
 
 ACE_INLINE TAO_ORB_Table*
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index b4a84261f4f..94289bc2c52 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -23,6 +23,19 @@
 
 ACE_RCSID(tao, Object, "$Id$")
 
+void
+CORBA::release (CORBA_Object_ptr obj)
+{
+  if (obj)
+    obj->_decr_refcnt ();
+}
+
+CORBA::Boolean
+CORBA::is_nil (CORBA::Object_ptr obj)
+{
+  return obj == 0;
+}
+
 CORBA_Object::~CORBA_Object (void)
 {
   this->protocol_proxy_->_decr_refcnt ();
@@ -76,7 +89,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -87,10 +100,9 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
 
 
   // Loop until we succeed or we raise an exception.
-  // @@ Nanbor: Do we still need to clear the environment variable?
-  //  ACE_TRY_ENV.clear ();         
   for (;;)
     {
+      ACE_TRY_ENV.clear ();
       _tao_call.start (ACE_TRY_ENV);
       ACE_CHECK_RETURN (_tao_retval);
 
@@ -116,7 +128,9 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
       break;
     }
   TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(_tao_in >> CORBA::Any::to_boolean (_tao_retval)))
+  if (!(
+    (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+  ))
     ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
   return _tao_retval;
 }
@@ -144,9 +158,9 @@ CORBA_Object::_is_collocated (void) const
 
 CORBA::ULong
 CORBA_Object::_hash (CORBA::ULong maximum,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &env)
 {
-  return this->_stubobj ()->hash (maximum, ACE_TRY_ENV);
+  return this->_stubobj ()->hash (maximum, env);
 }
 
 // Compare two object references to see if they point to the same
@@ -157,33 +171,28 @@ CORBA_Object::_hash (CORBA::ULong maximum,
 
 CORBA::Boolean
 CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   if (other_obj == this)
     {
-      //      env.clear ();
+      env.clear ();
       return 1;
     }
 
-  return this->_stubobj ()->is_equivalent (other_obj, ACE_TRY_ENV);
+  return this->_stubobj ()->is_equivalent (other_obj, env);
 }
 
 // TAO's extensions
 
 TAO_ObjectKey *
-CORBA::Object::_key (CORBA::Environment &)
+CORBA::Object::_key (CORBA::Environment &env)
 {
   if (this->_stubobj () && this->_stubobj ()->profile_in_use ())
-    return this->_stubobj ()->profile_in_use ()->_key ();
+    return this->_stubobj ()->profile_in_use ()->_key (env);
 
   ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Null stub obj!!!\n"), 0);
 }
 
-const TAO_ObjectKey &
-CORBA::Object::_object_key (void)
-{
-  return this->_stubobj ()->profile_in_use ()->object_key ();
-}
 
 // @@ This doesn't seemed to be used anyplace! It should go away!! FRED
 void
@@ -212,7 +221,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -222,9 +231,9 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
     );
 
 
-  // ACE_TRY_ENV.clear ();
   for (;;)
   {
+    ACE_TRY_ENV.clear ();
     _tao_call.start (ACE_TRY_ENV);
     ACE_CHECK_RETURN (_tao_retval);
 
@@ -260,20 +269,20 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                                CORBA::NamedValue_ptr result,
                                CORBA::Request_ptr &request,
                                CORBA::Flags req_flags,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &TAO_IN_ENV)
 {
   // Since we don't really support Context, anything but a null pointer
   // is a no-no.
   if (ctx)
     {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      TAO_THROW (CORBA::NO_IMPLEMENT ());
     }
   request = new CORBA::Request (this,
                                 operation,
                                 arg_list,
                                 result,
                                 req_flags,
-                                ACE_TRY_ENV);
+                                TAO_IN_ENV);
 }
 
 void
@@ -285,30 +294,30 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                                CORBA::ContextList_ptr,
                                CORBA::Request_ptr &request,
                                CORBA::Flags req_flags,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &TAO_IN_ENV)
 {
   // Since we don't really support Context, anything but a null pointer
   // is a no-no.
   if (ctx)
     {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
+      TAO_THROW (CORBA::NO_IMPLEMENT ());
     }
   request = new CORBA::Request (this,
                                 operation,
                                 arg_list,
                                 result,
                                 req_flags,
-                                ACE_TRY_ENV);
+                                TAO_IN_ENV);
 }
 
 CORBA::Request_ptr
 CORBA_Object::_request (const CORBA::Char *operation,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &TAO_IN_ENV)
 {
-  //  ACE_TRY_ENV.clear ();
+  TAO_IN_ENV.clear ();
   return new CORBA::Request (this,
                              operation,
-                             ACE_TRY_ENV);
+                             TAO_IN_ENV);
 }
 
 CORBA::InterfaceDef_ptr
@@ -323,7 +332,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV)
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index d849643c321..5156e481168 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -172,11 +172,6 @@ public:
   // Return the object key as an out parameter.  Caller should release
   // return value when finished with it.
 
-  virtual const TAO_ObjectKey &_object_key (void);
-  // Return a reference to the object key of profile in-use.
-  // If there's no in-use profile, then the program will
-  // probably crash.  This method does not create a new copy.
-
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA_Object_ptr _ptr_type;
   typedef CORBA_Object_var _var_type;
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index ba601235b64..ebf1aaf2e70 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -51,22 +51,6 @@ CORBA_Object::_stubobj (void) const
   return this->protocol_proxy_;
 }
 
-// ************************************************************
-// These are in CORBA namespace
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Object_ptr obj)
-{
-  return obj == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA_Object_ptr obj)
-{
-  if (obj)
-    obj->_decr_refcnt ();
-}
-
 // DII hook to objref
 //
 // The mapping for create_request is split into two forms,
diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp
index ae80c983132..4d5a1cf3b37 100644
--- a/TAO/tao/Object_Adapter.cpp
+++ b/TAO/tao/Object_Adapter.cpp
@@ -830,9 +830,6 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
                                 0,
                                 operation);
 
-  // We have setup the POA Current.  Record this for later use.
-  this->state_ = POA_CURRENT_SETUP;
-
   {
     ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START);
 
@@ -939,21 +936,12 @@ TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
 
       /** Fall through **/
 
-    case POA_CURRENT_SETUP:
-
-      // Teardown current for this request.
-      this->current_context_.teardown ();
-
-      /** Fall through **/
-
     case OBJECT_ADAPTER_LOCK_ACQUIRED:
 
       // Finally, since the object adapter lock was acquired, we must
       // release it.
       this->object_adapter_.lock ().release ();
 
-      /** Fall through **/
-
     case INITIAL_STAGE:
     default:
       // @@ Keep compiler happy, the states above are the only
@@ -996,8 +984,8 @@ TAO_POA_Current_Impl::setup (TAO_POA *impl,
   this->operation_ = operation;
 
   // Set the current context and remember the old one.
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+  TAO_ORB_Core_TSS_Resources *tss =
+    TAO_ORB_CORE_TSS_RESOURCES::instance ();
 
   this->previous_current_impl_ = tss->poa_current_impl_;
   tss->poa_current_impl_ = this;
@@ -1006,8 +994,7 @@ TAO_POA_Current_Impl::setup (TAO_POA *impl,
   this->setup_done_ = 1;
 }
 
-void
-TAO_POA_Current_Impl::teardown (void)
+TAO_POA_Current_Impl::~TAO_POA_Current_Impl (void)
 {
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
@@ -1073,8 +1060,8 @@ TAO_POA_Current_Impl::teardown (void)
 
   if (this->setup_done_)
     {
-      TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
+      TAO_ORB_Core_TSS_Resources *tss =
+        TAO_ORB_CORE_TSS_RESOURCES::instance ();
 
       // Reset the old context.
       tss->poa_current_impl_ = this->previous_current_impl_;
@@ -1136,14 +1123,14 @@ TAO_POA_Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
 TAO_POA_Current_Impl *
 TAO_POA_Current::implementation (void)
 {
-  return TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
+  return TAO_ORB_CORE_TSS_RESOURCES::instance ()->poa_current_impl_;
 }
 
 TAO_POA_Current_Impl *
 TAO_POA_Current::implementation (TAO_POA_Current_Impl *new_current)
 {
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+  TAO_ORB_Core_TSS_Resources *tss =
+    TAO_ORB_CORE_TSS_RESOURCES::instance ();
 
   TAO_POA_Current_Impl *old = tss->poa_current_impl_;
   tss->poa_current_impl_ = new_current;
diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/Object_Adapter.h
index ef376dfd81c..e67915fd602 100644
--- a/TAO/tao/Object_Adapter.h
+++ b/TAO/tao/Object_Adapter.h
@@ -150,8 +150,8 @@ public:
   TAO_POA_Current_Impl (void);
   // Convenience constructor combining construction & initialization.
 
-  void teardown (void);
-  // Teardown the current for this request.
+  ~TAO_POA_Current_Impl (void);
+  // Destructor
 
   void setup (TAO_POA *impl,
               const TAO_ObjectKey &key,
@@ -558,7 +558,7 @@ public:
 
   friend class Non_Servant_Upcall;
 
-  class TAO_Export Servant_Upcall
+  class Servant_Upcall
   {
     // = TITLE
     //     This class finds out the POA and the servant to perform an
@@ -600,7 +600,6 @@ public:
     {
       INITIAL_STAGE,
       OBJECT_ADAPTER_LOCK_ACQUIRED,
-      POA_CURRENT_SETUP,
       OBJECT_ADAPTER_LOCK_RELEASED,
       SERVANT_LOCK_ACQUIRED
     };
@@ -610,10 +609,6 @@ public:
     PortableServer::ObjectId id_;
 
     TAO_POA_Current_Impl current_context_;
-
-  private:
-    Servant_Upcall (const Servant_Upcall &);
-    void operator= (const Servant_Upcall &);
   };
 
   friend class Servant_Upcall;
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 7edabe89708..3c66349b5ea 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -42,7 +42,7 @@ public:
   TAO_ObjectKey& operator= (const TAO_ObjectKey &);
 };
 
-class TAO_Export TAO_ObjectKey_var
+class TAO_ObjectKey_var
 {
 public:
   TAO_ObjectKey_var (void); // default constructor
@@ -70,7 +70,7 @@ private:
   TAO_ObjectKey *ptr_;
 };
 
-class TAO_Export TAO_ObjectKey_out
+class TAO_ObjectKey_out
 {
 public:
   TAO_ObjectKey_out (TAO_ObjectKey *&);
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index 5b3aa88aa6c..ec4205e34ec 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -280,17 +280,6 @@ TAO_POA::find_POA (const char *adapter_name,
   // Lock access for the duration of this transaction.
   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
-  // 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->orb_core_.object_adapter ());
-  ACE_UNUSED_ARG (non_servant_upcall);
-
   TAO_POA *child = this->find_POA_i (adapter_name,
                                      activate_it,
                                      ACE_TRY_ENV);
@@ -741,8 +730,7 @@ TAO_POA::check_for_valid_wait_for_completions (CORBA::Boolean wait_for_completio
 {
   if (wait_for_completion)
     {
-      TAO_POA_Current_Impl *poa_current_impl =
-        TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
+      TAO_POA_Current_Impl *poa_current_impl = TAO_ORB_CORE_TSS_RESOURCES::instance ()->poa_current_impl_;
 
       // This thread cannot currently be in an upcall.
       if (poa_current_impl != 0)
@@ -965,7 +953,7 @@ TAO_POA::check_poa_manager_state (CORBA::Environment &ACE_TRY_ENV)
       // ORB may always reject a request for other reasons and raise
       // some other system exception.)
       ACE_THROW (CORBA::TRANSIENT (
-        CORBA_SystemException::_tao_minor_code (
+        CORBA_SystemException::minor_code_tao_ (
           TAO_POA_DISCARDING,
           0),
         CORBA::COMPLETED_NO));
@@ -985,7 +973,7 @@ TAO_POA::check_poa_manager_state (CORBA::Environment &ACE_TRY_ENV)
       // Since there is no queuing in TAO, we immediately raise a
       // TRANSIENT exception.
       ACE_THROW (CORBA::TRANSIENT (
-        CORBA_SystemException::_tao_minor_code (
+        CORBA_SystemException::minor_code_tao_ (
           TAO_POA_HOLDING,
           0),
         CORBA::COMPLETED_NO));
@@ -2597,6 +2585,12 @@ TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value,
 {
 }
 
+TAO_Thread_Policy::TAO_Thread_Policy (const TAO_Thread_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
 PortableServer::ThreadPolicyValue
 TAO_Thread_Policy::value (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -2672,6 +2666,12 @@ TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue va
 {
 }
 
+TAO_Lifespan_Policy::TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
 PortableServer::LifespanPolicyValue
 TAO_Lifespan_Policy::value (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -2745,6 +2745,12 @@ TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniqueness
 {
 }
 
+TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
 PortableServer::IdUniquenessPolicyValue
 TAO_Id_Uniqueness_Policy::value (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -2818,6 +2824,12 @@ TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignment
 {
 }
 
+TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
 PortableServer::IdAssignmentPolicyValue
 TAO_Id_Assignment_Policy::value (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -2893,6 +2905,12 @@ TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer::
 {
 }
 
+TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
 PortableServer::ImplicitActivationPolicyValue
 TAO_Implicit_Activation_Policy::value (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -2966,6 +2984,12 @@ TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::Serv
 {
 }
 
+TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
 PortableServer::ServantRetentionPolicyValue
 TAO_Servant_Retention_Policy::value (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -3039,6 +3063,12 @@ TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::Re
 {
 }
 
+TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
 PortableServer::RequestProcessingPolicyValue
 TAO_Request_Processing_Policy::value (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -3275,11 +3305,6 @@ TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy,
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
-TAO_Adapter_Activator::TAO_Adapter_Activator (PortableServer::POAManager_ptr poa_manager)
-  : poa_manager_ (PortableServer::POAManager::_duplicate (poa_manager))
-{
-}
-
 CORBA::Boolean
 TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
                                         const char *name,
@@ -3290,7 +3315,7 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
 
   // This assumes that the lock on the parent is recursive
   PortableServer::POA_var child = parent->create_POA (name,
-                                                      this->poa_manager_.in (),
+                                                      PortableServer::POAManager::_nil (),
                                                       default_policies,
                                                       ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
index 1f0cafb1e51..797f25b3d4c 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/POA.h
@@ -65,6 +65,8 @@ public:
   TAO_Thread_Policy (PortableServer::ThreadPolicyValue value,
                      PortableServer::POA_ptr poa);
 
+  TAO_Thread_Policy (const TAO_Thread_Policy &new_policy);
+
   PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
@@ -90,6 +92,8 @@ public:
   TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value,
                        PortableServer::POA_ptr poa);
 
+  TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs);
+
   PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
@@ -113,6 +117,8 @@ public:
   TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value,
                             PortableServer::POA_ptr poa);
 
+  TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs);
+
   PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
@@ -136,6 +142,8 @@ public:
   TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value,
                             PortableServer::POA_ptr poa);
 
+  TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs);
+
   PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
@@ -161,6 +169,8 @@ public:
   TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value,
                                   PortableServer::POA_ptr poa);
 
+  TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs);
+
   PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
@@ -184,6 +194,8 @@ public:
   TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value,
                                 PortableServer::POA_ptr poa);
 
+  TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs);
+
   PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
@@ -207,6 +219,8 @@ public:
   TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value,
                                  PortableServer::POA_ptr poa);
 
+  TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs);
+
   PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
@@ -741,16 +755,9 @@ class TAO_Export TAO_Adapter_Activator : public POA_PortableServer::AdapterActiv
 {
 public:
 
-  TAO_Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
-
   CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
                                   const char *name,
                                   CORBA_Environment &ACE_TRY_ENV);
-
-protected:
-
-  PortableServer::POAManager_var poa_manager_;
-  // POA Manager
 };
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index a53b964b56b..2a77c6540b7 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -305,7 +305,7 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -440,7 +440,7 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA:
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -575,7 +575,7 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -709,7 +709,7 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -846,7 +846,7 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -981,7 +981,7 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1116,7 +1116,7 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -3243,7 +3243,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   ACE_NEW_RETURN (_tao_retval, PortableServer::ObjectId, _tao_retval);
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index cfdc1405679..a7b9ade3008 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -215,7 +215,6 @@ void* POA_PortableServer::ThreadPolicy::_downcast (
   return 0;
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
@@ -229,7 +228,6 @@ void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, voi
   else
     skel (req, this, context, ACE_TRY_ENV);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 const char* POA_PortableServer::ThreadPolicy::_interface_repository_id (void) const
 {
@@ -503,7 +501,6 @@ void* POA_PortableServer::LifespanPolicy::_downcast (
   return 0;
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
@@ -517,7 +514,6 @@ void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, v
   else
     skel (req, this, context, ACE_TRY_ENV);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 const char* POA_PortableServer::LifespanPolicy::_interface_repository_id (void) const
 {
@@ -788,7 +784,6 @@ void* POA_PortableServer::IdUniquenessPolicy::_downcast (
   return 0;
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
@@ -802,7 +797,6 @@ void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &re
   else
     skel (req, this, context, ACE_TRY_ENV);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 const char* POA_PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
 {
@@ -1073,7 +1067,6 @@ void* POA_PortableServer::IdAssignmentPolicy::_downcast (
   return 0;
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
@@ -1087,7 +1080,6 @@ void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &re
   else
     skel (req, this, context, ACE_TRY_ENV);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 const char* POA_PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
 {
@@ -1360,7 +1352,6 @@ void* POA_PortableServer::ImplicitActivationPolicy::_downcast (
   return 0;
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
@@ -1374,7 +1365,6 @@ void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerReque
   else
     skel (req, this, context, ACE_TRY_ENV);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 const char* POA_PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
 {
@@ -1645,7 +1635,6 @@ void* POA_PortableServer::ServantRetentionPolicy::_downcast (
   return 0;
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
@@ -1659,7 +1648,6 @@ void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest
   else
     skel (req, this, context, ACE_TRY_ENV);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 const char* POA_PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
 {
@@ -1930,7 +1918,6 @@ void* POA_PortableServer::RequestProcessingPolicy::_downcast (
   return 0;
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
@@ -1944,7 +1931,6 @@ void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerReques
   else
     skel (req, this, context, ACE_TRY_ENV);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 const char* POA_PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
 {
@@ -2051,6 +2037,20 @@ void* POA_PortableServer::POAManager::_downcast (
   return 0;
 }
 
+void POA_PortableServer::POAManager::_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) == -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_PortableServer::POAManager::_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/POAManager:1.0";
@@ -2176,6 +2176,20 @@ void* POA_PortableServer::AdapterActivator::_downcast (
   return 0;
 }
 
+void POA_PortableServer::AdapterActivator::_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) == -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_PortableServer::AdapterActivator::_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/AdapterActivator:1.0";
@@ -2259,6 +2273,20 @@ void* POA_PortableServer::ServantManager::_downcast (
   return 0;
 }
 
+void POA_PortableServer::ServantManager::_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) == -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_PortableServer::ServantManager::_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/ServantManager:1.0";
@@ -2332,6 +2360,20 @@ void* POA_PortableServer::ServantActivator::_downcast (
   return 0;
 }
 
+void POA_PortableServer::ServantActivator::_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) == -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_PortableServer::ServantActivator::_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/ServantActivator:1.0";
@@ -2438,6 +2480,20 @@ void* POA_PortableServer::ServantLocator::_downcast (
   return 0;
 }
 
+void POA_PortableServer::ServantLocator::_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) == -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_PortableServer::ServantLocator::_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/ServantLocator:1.0";
@@ -2547,6 +2603,20 @@ void* POA_PortableServer::POA::_downcast (
   return 0;
 }
 
+void POA_PortableServer::POA::_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) == -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_PortableServer::POA::_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/POA:1.0";
@@ -2956,6 +3026,20 @@ void* POA_PortableServer::Current::_downcast (
   return 0;
 }
 
+void POA_PortableServer::Current::_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) == -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_PortableServer::Current::_interface_repository_id (void) const
 {
   return "IDL:omg.org/PortableServer/Current:1.0";
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
index 1a013cabab1..ff12c1390a8 100644
--- a/TAO/tao/POAS.h
+++ b/TAO/tao/POAS.h
@@ -67,9 +67,9 @@ TAO_NAMESPACE POA_PortableServer
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     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 &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -146,9 +146,9 @@ TAO_NAMESPACE POA_PortableServer
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     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 &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -225,9 +225,9 @@ TAO_NAMESPACE POA_PortableServer
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     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 &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -304,9 +304,9 @@ TAO_NAMESPACE POA_PortableServer
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     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 &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -385,9 +385,9 @@ TAO_NAMESPACE POA_PortableServer
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     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 &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -464,9 +464,9 @@ TAO_NAMESPACE POA_PortableServer
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     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 &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -543,9 +543,9 @@ TAO_NAMESPACE POA_PortableServer
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()
                                        );
+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     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 &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -619,6 +619,8 @@ TAO_NAMESPACE POA_PortableServer
 
     virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
+
     PortableServer::POAManager *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
@@ -689,6 +691,8 @@ TAO_NAMESPACE POA_PortableServer
                              );
     virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
+
     PortableServer::AdapterActivator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
@@ -738,6 +742,8 @@ TAO_NAMESPACE POA_PortableServer
                              const char* logical_type_id
                              );
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
+
     PortableServer::ServantManager *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
@@ -785,6 +791,8 @@ TAO_NAMESPACE POA_PortableServer
 
     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
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
+
     PortableServer::ServantActivator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
@@ -850,6 +858,8 @@ TAO_NAMESPACE POA_PortableServer
 
     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
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
+
     PortableServer::ServantLocator *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
@@ -982,6 +992,8 @@ TAO_NAMESPACE POA_PortableServer
 
     virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,  CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
+
     PortableServer::POA *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
@@ -1164,6 +1176,8 @@ TAO_NAMESPACE POA_PortableServer
 
     virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0; // pure virtual
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
+
     PortableServer::Current *_this (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index 4554cf457d9..27adf2f9535 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -49,7 +49,7 @@ public:
 
   class Current;
   typedef Current *Current_ptr;
-  class  Current :  public virtual TAO_Local_ServantBase
+  class  Current :  public virtual TAO_ServantBase
   {
   protected:
     Current (void);
@@ -62,6 +62,8 @@ public:
         const char* logical_type_id
       );
 
+    virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_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;
 
@@ -93,12 +95,7 @@ public:
 
   class Policy;
   typedef Policy *Policy_ptr;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   class TAO_Export  Policy :  public virtual TAO_ServantBase
-#else
-  class TAO_Export  Policy :  public virtual TAO_Local_ServantBase
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
   {
   protected:
     Policy (void);
@@ -163,6 +160,7 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       );
+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     virtual void _dispatch (
         CORBA::ServerRequest &_tao_req,
@@ -170,7 +168,6 @@ public:
         CORBA_Environment &TAO_IN_ENV =
           TAO_default_environment ()
       );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
     CORBA_Policy_ptr _this (
         CORBA_Environment &TAO_IN_ENV =
@@ -214,7 +211,7 @@ public:
 
   class PolicyManager;
   typedef PolicyManager *PolicyManager_ptr;
-  class TAO_Export PolicyManager :  public virtual TAO_Local_ServantBase
+  class TAO_Export PolicyManager :  public virtual PortableServer::ServantBase
   {
   protected:
     PolicyManager (void);
@@ -240,6 +237,13 @@ public:
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
       ) = 0;
+    virtual void _dispatch (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_context,
+        CORBA::Environment &ACE_TRY_ENV =
+          CORBA::Environment::default_environment ()
+      );
+
     CORBA::PolicyManager *_this (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
@@ -298,6 +302,13 @@ public:
         const char* logical_type_id
       );
 
+    virtual void _dispatch (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_context,
+        CORBA::Environment &ACE_TRY_ENV =
+          CORBA::Environment::default_environment ()
+      );
+
     CORBA::PolicyCurrent *_this (
         CORBA::Environment &ACE_TRY_ENV =
           CORBA::Environment::default_environment ()
@@ -1004,6 +1015,13 @@ public:
         CORBA::Environment::default_environment ()
         ) = 0;
 
+  virtual void _dispatch (
+      CORBA::ServerRequest &_tao_req,
+      void *_tao_context,
+      CORBA::Environment &_tao_env =
+        CORBA::Environment::default_environment ()
+    );
+
   CORBA_DynAny *_this (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
@@ -1261,6 +1279,13 @@ public:
         CORBA::Environment::default_environment ()
      ) = 0;
 
+  virtual void _dispatch (
+      CORBA::ServerRequest &_tao_req,
+      void *_tao_context,
+      CORBA::Environment &_tao_env =
+        CORBA::Environment::default_environment ()
+    );
+
   CORBA_DynEnum *_this (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
@@ -1349,6 +1374,13 @@ public:
         CORBA::Environment::default_environment ()
      ) = 0;
 
+  virtual void _dispatch (
+      CORBA::ServerRequest &_tao_req,
+      void *_tao_context,
+      CORBA::Environment &_tao_env =
+        CORBA::Environment::default_environment ()
+    );
+
   CORBA_DynStruct *_this (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
@@ -1457,6 +1489,13 @@ public:
         CORBA::Environment::default_environment ()
      ) = 0;
 
+  virtual void _dispatch (
+      CORBA::ServerRequest &_tao_req,
+      void *_tao_context,
+      CORBA::Environment &_tao_env =
+        CORBA::Environment::default_environment ()
+    );
+
   CORBA_DynUnion *_this (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
@@ -1570,6 +1609,13 @@ public:
         CORBA::Environment::default_environment ()
     );
 
+  virtual void _dispatch (
+      CORBA::ServerRequest &_tao_req,
+      void *_tao_context,
+      CORBA::Environment &TAO_IN_ENV =
+        CORBA::Environment::default_environment ()
+    );
+
   CORBA_DynSequence *_this (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
@@ -1648,6 +1694,13 @@ public:
         CORBA::Environment::default_environment ()
      ) = 0;
 
+  virtual void _dispatch (
+      CORBA::ServerRequest &_tao_req,
+      void *_tao_context,
+      CORBA::Environment &_tao_env =
+        CORBA::Environment::default_environment ()
+    );
+
   CORBA_DynArray *_this (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 3c0cf9a8f8a..70464cde846 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -21,6 +21,49 @@
 
 ACE_RCSID(tao, Pluggable, "$Id$")
 
+TAO_IOP_Version::~TAO_IOP_Version (void)
+{
+}
+
+TAO_IOP_Version::TAO_IOP_Version (const TAO_IOP_Version &src)
+  : major (src.major),
+    minor (src.minor)
+{
+}
+
+TAO_IOP_Version::TAO_IOP_Version (CORBA::Octet maj, CORBA::Octet min)
+  : major (maj),
+    minor (min)
+{
+}
+
+void
+TAO_IOP_Version::set_version (CORBA::Octet maj, CORBA::Octet min)
+{
+  this->major = maj;
+  this->minor = min;
+}
+
+int
+TAO_IOP_Version::operator== (const TAO_IOP_Version *&src)
+{
+  return this->major == src->major && this->minor == src->minor;
+}
+
+int
+TAO_IOP_Version::operator== (const TAO_IOP_Version &src)
+{
+  return this->major == src.major && this->minor == src.minor;
+}
+
+TAO_IOP_Version &
+TAO_IOP_Version::operator= (const TAO_IOP_Version &src)
+{
+  this->major = src.major;
+  this->minor = src.minor;
+  return *this;
+}
+
 // ****************************************************************
 
 TAO_Profile::~TAO_Profile (void)
@@ -84,6 +127,12 @@ TAO_Unknown_Profile::to_string (CORBA::Environment &)
   return 0;
 }
 
+const TAO_opaque&
+TAO_Unknown_Profile::body (void) const
+{
+  return this->body_;
+}
+
 int
 TAO_Unknown_Profile::decode (TAO_InputCDR& cdr)
 {
@@ -108,8 +157,9 @@ TAO_Unknown_Profile::object_key (void) const
 }
 
 TAO_ObjectKey *
-TAO_Unknown_Profile::_key (void) const
+TAO_Unknown_Profile::_key (CORBA::Environment &) const
 {
+  // @@ THROW something???
   return 0;
 }
 
@@ -135,8 +185,8 @@ TAO_Unknown_Profile::hash (CORBA::ULong max,
                          this->body_.length ()) % max);
 }
 
-int
-TAO_Unknown_Profile::addr_to_string(char *buffer, size_t length)
+ASYS_TCHAR *
+TAO_Unknown_Profile::addr_to_string(void)
 {
   return 0;
 }
@@ -178,6 +228,31 @@ TAO_Transport::tag (void) const
   return this->tag_;
 }
 
+// @@ Alex: this stream stuff belongs to the TMS, right?
+//    Maybe the right interface is:
+//    TAO_Transport::bind_reply_dispatcher (request_id,
+//                                          reply_dispatcher,
+//                                          input_cdr);
+
+// @@ Do you need an accessor? Or is the CDR stream simply passed by
+//    the TMS to the right target.  We should go to the TMS and obtain
+//    the CDR stream from it, that way we can implement an optimized
+//    version of the TMS that uses a single CDR stream allocated from
+//    the stack.
+
+// Get the CDR stream for reading the input message.
+TAO_InputCDR *
+TAO_Transport::input_cdr_stream (void) const
+{
+  return this->tms_->get_cdr_stream ();
+}
+
+void
+TAO_Transport::destroy_cdr_stream (TAO_InputCDR *cdr) const
+{
+  this->tms_->destroy_cdr_stream (cdr);
+}
+
 // Get it.
 TAO_ORB_Core *
 TAO_Transport::orb_core (void) const
@@ -237,30 +312,6 @@ TAO_Transport::wait_for_reply (void)
   return this->ws_->wait ();
 }
 
-void
-TAO_Transport::start_request (TAO_ORB_Core *,
-                              const TAO_Profile *,
-                              const char* ,
-                              CORBA::ULong ,
-                              CORBA::Boolean,
-                              TAO_OutputCDR &,
-                              CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW (CORBA::INTERNAL ());
-}
-
-void
-TAO_Transport::start_locate (TAO_ORB_Core *,
-                             const TAO_Profile *,
-                             CORBA::ULong,
-                             TAO_OutputCDR &,
-                             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW (CORBA::INTERNAL ());
-}
-
 // *********************************************************************
 
 // Connector
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index 08a38a9d1f8..13edd52edac 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -23,6 +23,7 @@
 #include "tao/corbafwd.h"
 #include "tao/Sequence.h"
 #include "tao/Typecode.h"
+#include "tao/GIOP.h"
 
 // Forward declarations.
 class ACE_Addr;
@@ -117,29 +118,17 @@ public:
   // not clear this this is the best place to specify this.  The actual
   // timeout values will be kept in the Policies.
 
-  virtual void start_request (TAO_ORB_Core *orb_core,
-                              const TAO_Profile *profile,
-                              const char* opname,
-                              CORBA::ULong request_id,
-                              CORBA::Boolean is_twoway,
-                              TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Fill into <output> the right headers to make a request.
-
-  virtual void start_locate (TAO_ORB_Core *orb_core,
-                             const TAO_Profile *profile,
-                             CORBA::ULong request_id,
-                             TAO_OutputCDR &output,
-                             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) = 0;
   // Default action to be taken for send request.
 
+  TAO_InputCDR *input_cdr_stream (void) const;
+  // Get the CDR stream for reading the input message.
+
+  void destroy_cdr_stream (TAO_InputCDR *) const;
+  // Release a CDR stream, simply pass it to the RMS...
+
   // = Get and set methods for the ORB Core.
 
   // void orb_core (TAO_ORB_Core *orb_core);
@@ -193,8 +182,53 @@ protected:
 
   TAO_Wait_Strategy *ws_;
   // Strategy for waiting for the reply after sending the request.
+
+  TAO_GIOP_Version version_;
+  // Version information found in the incoming message.
 };
 
+class TAO_Export TAO_IOP_Version
+{
+  // = TITLE
+  //   Major and Minor version number of the Inter-ORB Protocol.
+public:
+  CORBA::Octet major;
+  // Major version number
+
+  CORBA::Octet minor;
+  // Minor version number
+
+  TAO_IOP_Version (const TAO_IOP_Version &src);
+  // Copy constructor
+
+  TAO_IOP_Version (CORBA::Octet maj = 0,
+           CORBA::Octet min = 0);
+  // Default constructor.
+
+  ~TAO_IOP_Version (void);
+  // Destructor.
+
+  void set_version (CORBA::Octet maj, CORBA::Octet min);
+  // Explicitly set the major and minor version.
+
+  TAO_IOP_Version &operator= (const TAO_IOP_Version &src);
+  // Copy operator.
+
+  int operator== (const TAO_IOP_Version &src);
+  // Equality operator
+
+  int operator== (const TAO_IOP_Version *&src);
+  // Equality operator
+};
+
+// @@ Fred&Ossama: We need a *concrete* class (something that can be
+//    instantiated) that can be used to represent profiles for
+//    protocols we don't know.  This is required in the spec because
+//    we are supposed to preserve foreign profiles when communicating
+//    with other ORBs.
+//    A simple class with noops for most methods and just the basics
+//    required for marshaling and demarshaling is what we need.
+//
 class TAO_Export TAO_Profile
 {
   // = TITLE
@@ -220,6 +254,10 @@ public:
   CORBA::ULong _decr_refcnt (void);
   // Decrement the object's reference count.  When this count goes to
   // 0 this object will be deleted.
+  // @@ Fred&Ossama: guys, reference counting *should* be implemented
+  //    in the base class, otherwise you are just going to end up
+  //    repeating code and forcing the user to implement things not
+  //    directly related to protocols.
 
   void forward_to (TAO_MProfile *mprofiles);
   // Keep a pointer to the forwarded profile
@@ -236,6 +274,19 @@ public:
   // Return a string representation for this profile.  client must
   // deallocate memory.
 
+  virtual const TAO_opaque &body (void) const = 0;
+  // The body, an octet sequence that represent the marshaled
+  // profile.
+  // @@ Fred: We have to think about this method: it basically
+  //          requires the profile to keep both the <body> and the
+  //          interpreted representation (as host/port/etc.)
+  //          This is good for performance reasons, but it may consume
+  //          too much memory, maybe a method like this:
+  //
+  //          void body (TAO_opaque& return_body) const = 0;
+  //
+  //          will work better.
+
   virtual int decode (TAO_InputCDR& cdr) = 0;
   // Initialize this object using the given CDR octet string.
 
@@ -248,7 +299,7 @@ public:
   TAO_ObjectKey &object_key (TAO_ObjectKey& objkey);
   // @@ deprecated. set the Object Key.
 
-  virtual TAO_ObjectKey *_key (void) const = 0;
+  virtual TAO_ObjectKey *_key (CORBA::Environment &env) const = 0;
   // Obtain the object key, return 0 if the profile cannot be parsed.
   // The memory is owned by the caller!
 
@@ -262,12 +313,9 @@ public:
                              CORBA::Environment &env) = 0;
   // Return a hash value for this object.
 
-  virtual int addr_to_string(char *buffer, size_t length) = 0;
-  // Return a string representation for the address.  Returns
-  // -1 if buffer is too small.  The purpose of this method is to
-  // provide a general interface to the underlying address object's
-  // addr_to_string method.  This allowsthe protocol implementor to
-  // select the appropriate string format.
+  virtual ASYS_TCHAR *addr_to_string(void) = 0;
+  // Return a string representation for the address.
+  // @@ Fred: who owns the string returned?
 
   virtual void reset_hint (void) = 0;
   // This method is used with a connection has been reset requiring
@@ -314,15 +362,16 @@ public:
   virtual int parse_string (const char *string,
                             CORBA::Environment &env);
   virtual CORBA::String to_string (CORBA::Environment &env);
+  virtual const TAO_opaque &body (void) const;
   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 TAO_ObjectKey *_key (CORBA::Environment &env) const;
   virtual CORBA::Boolean is_equivalent (TAO_Profile* other_profile,
                                         CORBA::Environment &env);
   virtual CORBA::ULong hash (CORBA::ULong max,
                              CORBA::Environment &env);
-  virtual int addr_to_string(char *buffer, size_t length);
+  virtual ASYS_TCHAR *addr_to_string(void);
   virtual void reset_hint (void);
 
 private:
@@ -346,10 +395,7 @@ public:
                                TAO_MProfile &mprofile) = 0;
   // Create the corresponding profile for this endpoint.
 
-  virtual int open (TAO_ORB_Core *orb_core,
-                    int version_major,
-                    int version_minor,
-                    ACE_CString &address) = 0;
+  virtual int open (TAO_ORB_Core *orb_core, ACE_CString &address) = 0;
   // method to initialize acceptor for address.
 
   virtual int open_default (TAO_ORB_Core *orb_core) = 0;
diff --git a/TAO/tao/Pluggable.i b/TAO/tao/Pluggable.i
index 934cf4e062d..a4cbf97a151 100644
--- a/TAO/tao/Pluggable.i
+++ b/TAO/tao/Pluggable.i
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-// ****************************************************************
-
 ACE_INLINE
 TAO_Profile::TAO_Profile (CORBA::ULong tag)
   :  tag_ (tag),
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index c7ab70f3693..1d7a087c327 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -179,11 +179,7 @@ CORBA_Policy_ptr CORBA_Policy::_narrow (
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Policy:1.0");
   if (servant == 0)
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::Policy::_nil ());
-#else
     return new CORBA_Policy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
   return new POA_CORBA::_tao_collocated_Policy(
       ACE_reinterpret_cast(POA_CORBA::Policy_ptr, servant),
       stub
@@ -203,18 +199,13 @@ CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow (
   if (obj->_is_collocated () && obj->_servant() != 0)
     servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Policy:1.0");
   if (servant == 0)
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::Policy::_nil ());
-#else
     return new CORBA_Policy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
   return new POA_CORBA::_tao_collocated_Policy(
       ACE_reinterpret_cast(POA_CORBA::Policy_ptr, servant),
       stub
     );
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 CORBA::PolicyType CORBA_Policy::policy_type (
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -223,7 +214,7 @@ CORBA::PolicyType CORBA_Policy::policy_type (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -271,7 +262,7 @@ CORBA_Policy_ptr CORBA_Policy::copy (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -318,7 +309,7 @@ void CORBA_Policy::destroy (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    ACE_THROW (CORBA::INV_OBJREF ());
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -352,7 +343,6 @@ void CORBA_Policy::destroy (
   }
 
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
@@ -390,13 +380,13 @@ CORBA_Policy::_nil (void)
 CORBA_PolicyList::CORBA_PolicyList (void)
 {}
 CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var> (max)
+  : TAO_Unbounded_Object_Sequence<CORBA_Policy> (max)
 {}
 CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA_Policy_ptr *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var> (max, length, buffer, release)
+  : TAO_Unbounded_Object_Sequence<CORBA_Policy> (max, length, buffer, release)
 {}
 CORBA_PolicyList::CORBA_PolicyList (const CORBA_PolicyList &seq) // copy ctor
-  : TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var> (seq)
+  : TAO_Unbounded_Object_Sequence<CORBA_Policy> (seq)
 {}
 CORBA_PolicyList::~CORBA_PolicyList (void) // dtor
 {}
@@ -968,8 +958,8 @@ operator>> (
 
 template class TAO_Unbounded_Sequence<CORBA::UShort>;
 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_Unbounded_Object_Sequence<CORBA_Policy>;
+template class TAO_Object_Manager<CORBA_Policy>;
 
 //  template class TAO_Object_Field_T<CORBA_Policy>;
 //  template class TAO_Object_Field_T<CORBA_PolicyManager>;
@@ -979,8 +969,8 @@ template class TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>;
 
 #pragma instantiate TAO_Unbounded_Sequence<CORBA::UShort>
 #pragma instantiate TAO_Unbounded_Sequence<CORBA::ULong>
-#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
-#pragma instantiate TAO_Object_Manager<CORBA_Policy,CORBA_Policy_var>
+#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_Policy>
+#pragma instantiate TAO_Object_Manager<CORBA_Policy>
 
 //#  pragma instantiate TAO_Object_Field_T<CORBA_Policy>
 //#  pragma instantiate TAO_Object_Field_T<CORBA_PolicyManager>
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 5ee036fc789..ad0187265ce 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -148,7 +148,6 @@ public:
     );
   static CORBA_Policy_ptr _nil (void);
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   virtual CORBA::PolicyType policy_type (
       CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
@@ -161,21 +160,6 @@ public:
       CORBA_Environment &TAO_IN_ENV =
         TAO_default_environment ()
     );
-#else
-  virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &TAO_IN_ENV =
-        TAO_default_environment ()
-    ) = 0;
-  virtual CORBA_Policy_ptr copy (
-      CORBA_Environment &TAO_IN_ENV =
-        TAO_default_environment ()
-    ) = 0;
-  virtual void destroy (
-      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 &TAO_IN_ENV =
@@ -198,7 +182,7 @@ private:
 // CORBA_PolicyList
 // *************************************************************
 
-class TAO_Export  CORBA_PolicyList : public TAO_Unbounded_Object_Sequence<CORBA_Policy,CORBA_Policy_var>
+class TAO_Export  CORBA_PolicyList : public TAO_Unbounded_Object_Sequence<CORBA_Policy>
 {
 public:
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
@@ -239,7 +223,7 @@ public:
   operator const CORBA_PolicyList &() const;
   operator CORBA_PolicyList &();
   operator CORBA_PolicyList &() const;
-  TAO_Object_Manager <CORBA_Policy,CORBA_Policy_var > operator[] (CORBA::ULong index);
+  TAO_Object_Manager <CORBA_Policy > operator[] (CORBA::ULong index);
   // in, inout, out, _retn
   const CORBA_PolicyList &in (void) const;
   CORBA_PolicyList &inout (void);
@@ -262,7 +246,7 @@ public:
   operator CORBA_PolicyList *&();
   CORBA_PolicyList *&ptr (void);
   CORBA_PolicyList *operator-> (void);
-  TAO_Object_Manager <CORBA_Policy,CORBA_Policy_var> operator[] (CORBA::ULong index);
+  TAO_Object_Manager <CORBA_Policy > operator[] (CORBA::ULong index);
 
 private:
   CORBA_PolicyList *&ptr_;
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index 9a845dbec38..e7eac539a4d 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -301,7 +301,7 @@ CORBA_PolicyList_var::operator CORBA_PolicyList &() const// cast
   return *this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager <CORBA_Policy,CORBA_Policy_var >
+ACE_INLINE TAO_Object_Manager <CORBA_Policy >
 CORBA_PolicyList_var::operator[] (CORBA::ULong slot)
 {
   return this->ptr_->operator[] (slot);
@@ -398,7 +398,7 @@ CORBA_PolicyList_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager <CORBA_Policy,CORBA_Policy_var >
+ACE_INLINE TAO_Object_Manager <CORBA_Policy >
 CORBA_PolicyList_out::operator[] (CORBA::ULong slot)
 {
   return this->ptr_->operator[] (slot);
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
index c72f0668e98..079873eade6 100644
--- a/TAO/tao/PolicyS.cpp
+++ b/TAO/tao/PolicyS.cpp
@@ -255,7 +255,6 @@ void* POA_CORBA::Policy::_downcast (
   return 0;
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
@@ -269,7 +268,6 @@ void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, COR
 else
     skel (req, this, context, env);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 const char* POA_CORBA::Policy::_interface_repository_id (void) const
 {
@@ -377,6 +375,12 @@ void* POA_CORBA::PolicyManager::_downcast (
   return 0;
 }
 
+void POA_CORBA::PolicyManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+{
+  // @@ TODO
+  ACE_THROW (CORBA_BAD_OPERATION ());
+}
+
 const char* POA_CORBA::PolicyManager::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/PolicyManager:1.0";
@@ -487,6 +491,11 @@ void* POA_CORBA::PolicyCurrent::_downcast (
   return 0;
 }
 
+void POA_CORBA::PolicyCurrent::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+{
+  ACE_THROW (CORBA_BAD_OPERATION ());
+}
+
 const char* POA_CORBA::PolicyCurrent::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index d693805fd4d..6203c5b3ae8 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -272,8 +272,8 @@ TAO_Policy_Manager_Impl::get_policy (
 TAO_Policy_Current_Impl &
 TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
 {
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+  TAO_ORB_Core_TSS_Resources *tss =
+    TAO_ORB_CORE_TSS_RESOURCES::instance ();
 
   TAO_Policy_Current_Impl *old = tss->policy_current_;
   tss->policy_current_ = &current;
@@ -283,7 +283,7 @@ TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
 TAO_Policy_Current_Impl &
 TAO_Policy_Current::implementation (void) const
 {
-  return *TAO_TSS_RESOURCES::instance ()->policy_current_;
+  return *TAO_ORB_CORE_TSS_RESOURCES::instance ()->policy_current_;
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index feaef39ab1f..9e4a8c926ae 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -80,7 +80,7 @@ CORBA::Boolean CORBA_Pollable::is_ready (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -134,7 +134,7 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -413,7 +413,7 @@ CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -461,7 +461,7 @@ void CORBA_PollableSet::add_pollable (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    ACE_THROW (CORBA::INV_OBJREF ());
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -516,7 +516,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -575,7 +575,7 @@ void CORBA_PollableSet::remove (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW (CORBA::INTERNAL ());
+    ACE_THROW (CORBA::INV_OBJREF ());
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -624,7 +624,7 @@ CORBA::UShort CORBA_PollableSet::number_left (
 
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
 
 
   TAO_GIOP_Twoway_Invocation _tao_call (
diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp
index ce7cf946db0..db5606873b0 100644
--- a/TAO/tao/Principal.cpp
+++ b/TAO/tao/Principal.cpp
@@ -14,7 +14,6 @@
 ACE_RCSID(tao, Principal, "$Id$")
 
 CORBA_Principal::CORBA_Principal (void)
-  : refcount_ (1)
 {
 }
 
@@ -23,6 +22,19 @@ CORBA_Principal::~CORBA_Principal (void)
 }
 
 CORBA::Boolean
+CORBA::is_nil (CORBA::Principal_ptr principal)
+{
+  return (CORBA::Boolean) (principal == 0);
+}
+
+void
+CORBA::release (CORBA::Principal_ptr principal)
+{
+  if (principal)
+    principal->_decr_refcnt ();
+}
+
+CORBA::Boolean
 operator<< (TAO_OutputCDR& cdr, CORBA_Principal* x)
 {
   if (x != 0)
diff --git a/TAO/tao/Principal.i b/TAO/tao/Principal.i
index 03979d2bbb2..764491d6860 100644
--- a/TAO/tao/Principal.i
+++ b/TAO/tao/Principal.i
@@ -1,9 +1,9 @@
 // $Id$
 
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Principal_ptr principal)
+ACE_INLINE CORBA::ULong
+CORBA_Principal::_incr_refcnt (void)
 {
-  return (CORBA::Boolean) (principal == 0);
+  return this->refcount_++;
 }
 
 ACE_INLINE CORBA::ULong
@@ -19,20 +19,6 @@ CORBA_Principal::_decr_refcnt (void)
   return 0;
 }
 
-ACE_INLINE void
-CORBA::release (CORBA::Principal_ptr principal)
-{
-  if (principal)
-    principal->_decr_refcnt ();
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_Principal::_incr_refcnt (void)
-{
-  return this->refcount_++;
-}
-
-
 ACE_INLINE CORBA_Principal*
 CORBA_Principal::_duplicate (CORBA_Principal* x)
 {
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index e4b560bfc9e..0a205c8eeba 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -16,8 +16,8 @@ TAO_Reply_Dispatcher::~TAO_Reply_Dispatcher (void)
 {
 }
 
-TAO_GIOP_Message_State *
-TAO_Reply_Dispatcher::message_state (void) const
+TAO_InputCDR *
+TAO_Reply_Dispatcher::cdr (void) const
 {
   return 0;
 }
@@ -25,10 +25,9 @@ TAO_Reply_Dispatcher::message_state (void) const
 // *********************************************************************
 
 // 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_InputCDR* cdr)
 {
+  this->cdr_ = cdr;
 }
 
 // Destructor.
@@ -41,14 +40,8 @@ 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)
+                                            TAO_InputCDR*)
 {
-  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_status_ = reply_status;
   this->version_ = version;
 
@@ -62,8 +55,8 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (CORBA::ULong reply_status,
   return 0;
 }
 
-TAO_GIOP_Message_State *
-TAO_Synch_Reply_Dispatcher::message_state (void) const
+TAO_InputCDR *
+TAO_Synch_Reply_Dispatcher::cdr (void) const
 {
-  return this->message_state_;
+  return this->cdr_;
 }
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 90132289124..f0d9ace84ad 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -43,14 +43,11 @@ public:
   virtual int dispatch_reply (CORBA::ULong reply_status,
                               const TAO_GIOP_Version& version,
                               TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state) = 0;
+                              TAO_InputCDR* cdr) = 0;
   // 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.
+  virtual TAO_InputCDR *cdr (void) const;
+  // Get the CDR stream (if any)
 };
 
 class TAO_Export TAO_Synch_Reply_Dispatcher : public TAO_Reply_Dispatcher
@@ -63,7 +60,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_InputCDR* cdr);
   // Constructor.
 
   virtual ~TAO_Synch_Reply_Dispatcher (void);
@@ -81,8 +78,8 @@ public:
   virtual int dispatch_reply (CORBA::ULong reply_status,
                               const TAO_GIOP_Version& version,
                               TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state);
-  virtual TAO_GIOP_Message_State *message_state (void) const;
+                              TAO_InputCDR* cdr);
+  virtual TAO_InputCDR *cdr (void) const;
 
 private:
   CORBA::ULong reply_status_;
@@ -94,7 +91,7 @@ private:
   TAO_GIOP_ServiceContextList reply_ctx_;
   // The service context list
 
-  TAO_GIOP_Message_State *message_state_;
+  TAO_InputCDR *cdr_;
   // CDR stream for reading the input.
 };
 
diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp
index 4f093e4ef39..161cd7883cc 100644
--- a/TAO/tao/Request.cpp
+++ b/TAO/tao/Request.cpp
@@ -13,6 +13,19 @@
 
 ACE_RCSID(tao, Request, "$Id$")
 
+CORBA::Boolean
+CORBA::is_nil (CORBA::Request_ptr req)
+{
+  return (CORBA::Boolean) (req == 0);
+}
+
+void
+CORBA::release (CORBA::Request_ptr req)
+{
+  if (req)
+    req->_decr_refcnt ();
+}
+
 CORBA::ULong
 CORBA_Request::_incr_refcnt (void)
 {
@@ -149,13 +162,13 @@ CORBA_Request::poll_response (CORBA::Environment &ACE_TRY_ENV)
 
 //  constructor.
 CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request,CORBA_Request_var> (max)
+  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request> (max)
 {
   // no-op
 }
 
 CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &rhs)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request,CORBA_Request_var> (rhs)
+  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request> (rhs)
 {
   // no-op
 }
@@ -164,7 +177,7 @@ CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max,
                                             CORBA::ULong length,
                                             CORBA_Request **data,
                                             CORBA::Boolean release)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request,CORBA_Request_var> (max,
+  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request> (max,
                                                    length,
                                                    data,
                                                    release)
@@ -393,11 +406,11 @@ CORBA_ORB_RequestSeq::replace (CORBA::ULong max,
 */
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Pseudo_Sequence<CORBA_Request,CORBA_Request_var>;
-template class TAO_Object_Manager<CORBA_Request,CORBA_Request_var>;
+template class TAO_Unbounded_Pseudo_Sequence<CORBA_Request>;
+template class TAO_Object_Manager<CORBA_Request>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA_Request,CORBA_Request_var>
-#pragma instantiate TAO_Object_Manager<CORBA_Request,CORBA_Request_var>
+#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA_Request>
+#pragma instantiate TAO_Object_Manager<CORBA_Request>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h
index 000157734df..74d9322ce5d 100644
--- a/TAO/tao/Request.h
+++ b/TAO/tao/Request.h
@@ -247,12 +247,8 @@ private:
   CORBA_Request_ptr &ptr_;
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/Request.i"
-#endif /* __ACE_INLINE__ */
-
 // Make sure you instantiate this in Request.cpp
-class CORBA_ORB_RequestSeq : public TAO_Unbounded_Pseudo_Sequence<CORBA_Request,CORBA_Request_var>
+class CORBA_ORB_RequestSeq : public TAO_Unbounded_Pseudo_Sequence<CORBA_Request>
 {
 public:
 // Helpful with template programming.
@@ -389,6 +385,10 @@ private:
   void operator= (const CORBA_ORB_RequestSeq_var &);
 };
 
+#if defined (__ACE_INLINE__)
+# include "tao/Request.i"
+#endif /* __ACE_INLINE__ */
+
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 #endif /* TAO_REQUEST_H */
diff --git a/TAO/tao/Request.i b/TAO/tao/Request.i
index 2e9c42c7a70..32edec32e42 100644
--- a/TAO/tao/Request.i
+++ b/TAO/tao/Request.i
@@ -2,20 +2,9 @@
 
 // This may look like C, but it's really -*- C++ -*-
 
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Request_ptr req)
-{
-  return (CORBA::Boolean) (req == 0);
-}
+// Return the target of this request.
 
-ACE_INLINE void
-CORBA::release (CORBA::Request_ptr req)
-{
-  if (req)
-    req->_decr_refcnt ();
-}
 
-// Return the target of this request.
 ACE_INLINE CORBA_Request*
 CORBA_Request::_duplicate (CORBA_Request* x)
 {
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
index f2a32c17401..0b9995f36f7 100644
--- a/TAO/tao/Resource_Factory.cpp
+++ b/TAO/tao/Resource_Factory.cpp
@@ -55,12 +55,6 @@ TAO_Resource_Factory::~TAO_Resource_Factory (void)
 {
 }
 
-int
-TAO_Resource_Factory::use_tss_resources (void) const
-{
-  return 0;
-}
-
 ACE_Reactor *
 TAO_Resource_Factory::get_reactor (void)
 {
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index 31b88431a6a..4c2eb55628f 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -99,10 +99,6 @@ public:
 
   // = Resource Retrieval
 
-  virtual int use_tss_resources (void) const;
-  // @@ Backwards compatibility, return 1 if the ORB core should use
-  //    TSS resources
-
   virtual ACE_Reactor *get_reactor (void);
   // Return an <ACE_Reactor> to be utilized.
 
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 116d4cb6d62..c753666365f 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -192,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>
+TAO_Object_Manager<T>&
+TAO_Object_Manager<T>::operator= (const TAO_Object_Manager<T> &rhs)
 {
   if (this == &rhs)
     return *this;
@@ -210,8 +210,8 @@ TAO_Object_Manager<T,T_var>::operator= (const TAO_Object_Manager<T,T_var> &rhs)
   return *this;
 }
 
-template <class T,class T_var>TAO_Object_Manager<T,T_var> &
-TAO_Object_Manager<T,T_var>::operator=(T* p)
+template <class T>TAO_Object_Manager<T> &
+TAO_Object_Manager<T>::operator=(T* p)
 {
   if (this->release_)
     {
@@ -228,43 +228,25 @@ TAO_Object_Manager<T,T_var>::operator=(T* p)
   return *this;
 }
 
-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_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.  However, we will release it.
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (p.in ());
-    }
-  else
-    *this->ptr_ = p.in ();
-
-  return *this;
-}
-
 // *************************************************************
 // Operations for class TAO_Unbounded_Object_Sequence
 // *************************************************************
 
 // constructor for unbounded seq
-template <class T,class T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::
+template <class T>
+TAO_Unbounded_Object_Sequence<T>::
 TAO_Unbounded_Object_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (maximum))
+                                 TAO_Unbounded_Object_Sequence<T>::allocbuf (maximum))
 {
 }
 
-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)
+template <class T>
+TAO_Unbounded_Object_Sequence<T>::
+TAO_Unbounded_Object_Sequence (const TAO_Unbounded_Object_Sequence<T> &rhs)
   : TAO_Unbounded_Base_Sequence (rhs)
 {
-  T **tmp1 = TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (this->maximum_);
+  T **tmp1 = TAO_Unbounded_Object_Sequence<T>::allocbuf (this->maximum_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
@@ -273,16 +255,16 @@ TAO_Unbounded_Object_Sequence (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs
   this->buffer_ = tmp1;
 }
 
-template<class T,class T_var>
-TAO_Unbounded_Object_Sequence<T,T_var>::~TAO_Unbounded_Object_Sequence (void)
+template<class T>
+TAO_Unbounded_Object_Sequence<T>::~TAO_Unbounded_Object_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
 // assignment operator
-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)
+template <class T>TAO_Unbounded_Object_Sequence<T>&
+TAO_Unbounded_Object_Sequence<T>::
+operator= (const TAO_Unbounded_Object_Sequence<T> &rhs)
 {
   if (this == &rhs)
     return *this;
@@ -299,14 +281,14 @@ operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
         }
       if (this->maximum_ < rhs.maximum_)
         {
-          TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
+          TAO_Unbounded_Object_Sequence<T>::freebuf (tmp);
           this->buffer_ =
-            TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (rhs.maximum_);
+            TAO_Unbounded_Object_Sequence<T>::allocbuf (rhs.maximum_);
         }
     }
   else
     this->buffer_ =
-      TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (rhs.maximum_);
+      TAO_Unbounded_Object_Sequence<T>::allocbuf (rhs.maximum_);
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
@@ -319,8 +301,8 @@ operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
   return *this;
 }
 
-template <class T,class T_var> T **
-TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
+template <class T> T **
+TAO_Unbounded_Object_Sequence<T>::allocbuf (CORBA::ULong nelems)
 {
   T **buf;
 
@@ -332,8 +314,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
   return buf;
 }
 
-template <class T,class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (T **buffer)
+template <class T> void
+TAO_Unbounded_Object_Sequence<T>::freebuf (T **buffer)
 {
   if (buffer == 0)
     return;
@@ -353,10 +335,10 @@ TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (T **buffer)
   delete[] buffer;
 }
 
-template<class T,class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
+template<class T> void
+TAO_Unbounded_Object_Sequence<T>::_allocate_buffer (CORBA::ULong length)
 {
-  T **tmp = TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (length);
+  T **tmp = TAO_Unbounded_Object_Sequence<T>::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
@@ -378,8 +360,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
   this->buffer_ = tmp;
 }
 
-template<class T,class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (void)
+template<class T> void
+TAO_Unbounded_Object_Sequence<T>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
@@ -389,12 +371,12 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (void)
       CORBA::release (tmp[i]);
       tmp[i] = T::_nil ();
     }
-  TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
+  TAO_Unbounded_Object_Sequence<T>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T,class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
+template<class T> void
+TAO_Unbounded_Object_Sequence<T>::_shrink_buffer (CORBA::ULong nl,
                                                   CORBA::ULong ol)
 {
   T **tmp = ACE_static_cast (T**, this->buffer_);
@@ -406,18 +388,18 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
     }
 }
 
-template <class T,class T_var> void
-TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
-                                                   CORBA_Object* src,
-                                                   CORBA_Environment &env)
+template <class T> void
+TAO_Unbounded_Object_Sequence<T>::_downcast (void* target,
+                                             CORBA_Object* src,
+                                             CORBA_Environment &env)
 {
   T **tmp = ACE_static_cast (T**, target);
 
   *tmp = T::_narrow (src, env);
 }
 
-template <class T,class T_var> CORBA_Object*
-TAO_Unbounded_Object_Sequence<T,T_var>::_upcast (void* src) const
+template <class T> CORBA_Object*
+TAO_Unbounded_Object_Sequence<T>::_upcast (void* src) const
 {
   T **tmp = ACE_static_cast (T**, src);
 
@@ -428,30 +410,30 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_upcast (void* src) const
 // Operations for class TAO_Bounded_Object_Sequence
 // *************************************************************
 
-template <class T, class T_var,CORBA::ULong MAX>
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::
+template <class T, CORBA::ULong MAX>
+TAO_Bounded_Object_Sequence<T, MAX>::
 TAO_Bounded_Object_Sequence (void)
   :  TAO_Bounded_Base_Sequence (MAX,
-                                TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (MAX))
+                                TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (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)
+template <class T, CORBA::ULong MAX>
+TAO_Bounded_Object_Sequence<T, MAX>::
+TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T, MAX> &rhs)
   : TAO_Bounded_Base_Sequence (rhs)
 {
   T **tmp1 =
-    TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (MAX);
+    TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (MAX);
   T ** const tmp2 = ACE_reinterpret_cast (T** ACE_CAST_CONST, rhs.buffer_);
   for (CORBA::ULong i = 0; i < rhs.length_; i++)
     tmp1[i] = T::_duplicate (tmp2[i]);
   this->buffer_ = tmp1;
 }
 
-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)
+template <class T, CORBA::ULong MAX> TAO_Bounded_Object_Sequence<T, MAX>&
+TAO_Bounded_Object_Sequence<T, MAX>::operator=
+(const TAO_Bounded_Object_Sequence<T, MAX> &rhs)
 {
   if (this == &rhs)
     return *this;
@@ -470,7 +452,7 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator=
     }
   else
     this->buffer_ =
-      TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (rhs.maximum_);
+      TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (rhs.maximum_);
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
@@ -481,8 +463,8 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator=
   return *this;
 }
 
-template <class T, class T_var,CORBA::ULong MAX> T **
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
+template <class T, CORBA::ULong MAX> T **
+TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (CORBA::ULong)
 {
   T **buf;
 
@@ -494,8 +476,8 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
   return buf;
 }
 
-template <class T, class T_var,CORBA::ULong MAX> void
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::freebuf (T **buffer)
+template <class T, CORBA::ULong MAX> void
+TAO_Bounded_Object_Sequence<T, MAX>::freebuf (T **buffer)
 {
   // How much do we deallocate? Easy! allocbuf() always creates MAX
   // elements and initialize them to T::_nil().  So we can be
@@ -510,28 +492,28 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::freebuf (T **buffer)
   delete[] buffer;
 }
 
-template<class T, class T_var,CORBA::ULong MAX> void
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length)
+template<class T, CORBA::ULong MAX> void
+TAO_Bounded_Object_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong length)
 {
   // For this class memory is never reallocated so the implementation
   // is *really* simple.
   this->buffer_ =
-    TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (length);
+    TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (length);
 }
 
-template<class T, class T_var,CORBA::ULong MAX> void
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::_deallocate_buffer (void)
+template<class T, CORBA::ULong MAX> void
+TAO_Bounded_Object_Sequence<T, MAX>::_deallocate_buffer (void)
 {
   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);
+  TAO_Bounded_Object_Sequence<T, MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-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)
+template<class T, CORBA::ULong MAX> void
+TAO_Bounded_Object_Sequence<T, MAX>::_shrink_buffer (CORBA::ULong nl,
+                                                     CORBA::ULong ol)
 {
   T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
 
@@ -542,18 +524,18 @@ TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
     }
 }
 
-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 &env)
+template <class T, CORBA::ULong MAX> void
+TAO_Bounded_Object_Sequence<T, MAX>::_downcast (void* target,
+                                                  CORBA_Object* src,
+                                                  CORBA_Environment &env)
 {
   T **tmp = ACE_static_cast (T**, target);
 
   *tmp = T::_narrow (src, env);
 }
 
-template <class T, class T_var,CORBA::ULong MAX> CORBA_Object*
-TAO_Bounded_Object_Sequence<T, T_var,MAX>::_upcast (void* src) const
+template <class T, CORBA::ULong MAX> CORBA_Object*
+TAO_Bounded_Object_Sequence<T, MAX>::_upcast (void* src) const
 {
   T **tmp = ACE_static_cast (T**, src);
 
@@ -565,20 +547,20 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::_upcast (void* src) const
 // *************************************************************
 
 // constructor for unbounded seq
-template <class T,class T_var>
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::
+template <class T>
+TAO_Unbounded_Pseudo_Sequence<T>::
 TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum)
   : TAO_Unbounded_Base_Sequence (maximum,
-                                 TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (maximum))
+                                 TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (maximum))
 {
 }
 
-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)
+template <class T>
+TAO_Unbounded_Pseudo_Sequence<T>::
+TAO_Unbounded_Pseudo_Sequence (const TAO_Unbounded_Pseudo_Sequence<T> &rhs)
   : TAO_Unbounded_Base_Sequence (rhs)
 {
-  T **tmp1 = TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (this->maximum_);
+  T **tmp1 = TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (this->maximum_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
@@ -587,16 +569,16 @@ TAO_Unbounded_Pseudo_Sequence (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs
   this->buffer_ = tmp1;
 }
 
-template<class T,class T_var>
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::~TAO_Unbounded_Pseudo_Sequence (void)
+template<class T>
+TAO_Unbounded_Pseudo_Sequence<T>::~TAO_Unbounded_Pseudo_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
 // assignment operator
-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)
+template <class T> TAO_Unbounded_Pseudo_Sequence<T>&
+TAO_Unbounded_Pseudo_Sequence<T>::
+operator= (const TAO_Unbounded_Pseudo_Sequence<T> &rhs)
 {
   if (this == &rhs)
     return *this;
@@ -613,14 +595,14 @@ operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
         }
       if (this->maximum_ < rhs.maximum_)
         {
-          TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (tmp);
+          TAO_Unbounded_Pseudo_Sequence<T>::freebuf (tmp);
           this->buffer_ =
-            TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (rhs.maximum_);
+            TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (rhs.maximum_);
         }
     }
   else
     this->buffer_ =
-      TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (rhs.maximum_);
+      TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (rhs.maximum_);
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
@@ -633,8 +615,8 @@ operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
   return *this;
 }
 
-template <class T,class T_var> T **
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
+template <class T> T **
+TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (CORBA::ULong nelems)
 {
   T **buf;
 
@@ -646,8 +628,8 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
   return buf;
 }
 
-template <class T,class T_var> void
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (T **buffer)
+template <class T> void
+TAO_Unbounded_Pseudo_Sequence<T>::freebuf (T **buffer)
 {
   if (buffer == 0)
     return;
@@ -667,10 +649,10 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (T **buffer)
   delete[] buffer;
 }
 
-template<class T,class T_var> void
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
+template<class T> void
+TAO_Unbounded_Pseudo_Sequence<T>::_allocate_buffer (CORBA::ULong length)
 {
-  T **tmp = TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (length);
+  T **tmp = TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (length);
 
   if (this->buffer_ != 0)
     {
@@ -692,8 +674,8 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
   this->buffer_ = tmp;
 }
 
-template<class T,class T_var> void
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::_deallocate_buffer (void)
+template<class T> void
+TAO_Unbounded_Pseudo_Sequence<T>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
@@ -703,13 +685,13 @@ TAO_Unbounded_Pseudo_Sequence<T,T_var>::_deallocate_buffer (void)
       CORBA::release (tmp[i]);
       tmp[i] = T::_nil ();
     }
-  TAO_Unbounded_Pseudo_Sequence<T,T_var>::freebuf (tmp);
+  TAO_Unbounded_Pseudo_Sequence<T>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-template<class T,class T_var> void
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
-                                                        CORBA::ULong ol)
+template<class T> void
+TAO_Unbounded_Pseudo_Sequence<T>::_shrink_buffer (CORBA::ULong nl,
+                                                  CORBA::ULong ol)
 {
   T **tmp = ACE_static_cast (T**, this->buffer_);
 
@@ -724,30 +706,30 @@ 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,CORBA::ULong MAX>
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::
+template <class T, CORBA::ULong MAX>
+TAO_Bounded_Pseudo_Sequence<T, MAX>::
 TAO_Bounded_Pseudo_Sequence (void)
   :  TAO_Bounded_Base_Sequence (MAX,
-                                TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (MAX))
+                                TAO_Bounded_Pseudo_Sequence<T, MAX>::allocbuf (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)
+template <class T, CORBA::ULong MAX>
+TAO_Bounded_Pseudo_Sequence<T, MAX>::
+TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T, MAX> &rhs)
   : TAO_Bounded_Base_Sequence (rhs)
 {
   T **tmp1 =
-    TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (MAX);
+    TAO_Bounded_Pseudo_Sequence<T, MAX>::allocbuf (MAX);
   T ** const tmp2 = ACE_reinterpret_cast (T** ACE_CAST_CONST, rhs.buffer_);
   for (CORBA::ULong i = 0; i < rhs.length_; i++)
     tmp1[i] = T::_duplicate (tmp2[i]);
   this->buffer_ = tmp1;
 }
 
-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)
+template <class T, CORBA::ULong MAX> TAO_Bounded_Pseudo_Sequence<T, MAX>&
+TAO_Bounded_Pseudo_Sequence<T, MAX>::operator=
+(const TAO_Bounded_Pseudo_Sequence<T, MAX> &rhs)
 {
   if (this == &rhs)
     return *this;
@@ -766,7 +748,7 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator=
     }
   else
     this->buffer_ =
-      TAO_Bounded_Pseudo_Sequence<T, T_var, MAX>::allocbuf (rhs.maximum_);
+      TAO_Bounded_Pseudo_Sequence<T, MAX>::allocbuf (rhs.maximum_);
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
@@ -777,8 +759,8 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator=
   return *this;
 }
 
-template <class T, class T_var,CORBA::ULong MAX> T **
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
+template <class T, CORBA::ULong MAX> T **
+TAO_Bounded_Pseudo_Sequence<T, MAX>::allocbuf (CORBA::ULong)
 {
   T **buf;
 
@@ -790,8 +772,8 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
   return buf;
 }
 
-template <class T, class T_var,CORBA::ULong MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::freebuf (T **buffer)
+template <class T, CORBA::ULong MAX> void
+TAO_Bounded_Pseudo_Sequence<T, MAX>::freebuf (T **buffer)
 {
   // How much do we deallocate? Easy! allocbuf() always creates MAX
   // elements and initialize them to T::_nil().  So we can be
@@ -806,28 +788,28 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::freebuf (T **buffer)
   delete[] buffer;
 }
 
-template<class T, class T_var,CORBA::ULong MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_allocate_buffer (CORBA::ULong length)
+template<class T, CORBA::ULong MAX> void
+TAO_Bounded_Pseudo_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong length)
 {
   // For this class memory is never reallocated so the implementation
   // is *really* simple.
   this->buffer_ =
-    TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::allocbuf (length);
+    TAO_Bounded_Pseudo_Sequence<T, MAX>::allocbuf (length);
 }
 
-template<class T, class T_var,CORBA::ULong MAX> void
-TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::_deallocate_buffer (void)
+template<class T, CORBA::ULong MAX> void
+TAO_Bounded_Pseudo_Sequence<T, MAX>::_deallocate_buffer (void)
 {
   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);
+  TAO_Bounded_Pseudo_Sequence<T, MAX>::freebuf (tmp);
   this->buffer_ = 0;
 }
 
-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)
+template<class T, CORBA::ULong MAX> void
+TAO_Bounded_Pseudo_Sequence<T, MAX>::_shrink_buffer (CORBA::ULong nl,
+                                                     CORBA::ULong ol)
 {
   T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
 
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index e095e57c03e..427bf186584 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -214,13 +214,13 @@ public:
 
 // *************************************************************
 
-template<class T,class T_var> class TAO_Unbounded_Object_Sequence;
-template<class T, class T_var, CORBA::ULong MAX> class TAO_Bounded_Object_Sequence;
+template<class T> class TAO_Unbounded_Object_Sequence;
+template<class T, 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 TAO_Object_Manager
 {
   // = TITLE
@@ -250,7 +250,7 @@ class TAO_Object_Manager
   //   says that T_ptr *could* map to a type different to T* in the
   //   particular case of TAO it does map to <T*>.
   //
-  friend class TAO_Unbounded_Object_Sequence<T,T_var>;
+  friend class TAO_Unbounded_Object_Sequence<T>;
 public:
   // @@ Use partial template specialization here to give access only
   // to the right kind of sequence.
@@ -258,7 +258,7 @@ public:
   //    class TAO_Bounded_Object_Sequence<T,MAX>;
 
   // = Initialization and termination methods.
-  TAO_Object_Manager (const TAO_Object_Manager<T,T_var> &rhs);
+  TAO_Object_Manager (const TAO_Object_Manager<T> &rhs);
   // Copy constructor, the semantics are non-trivial:
   //   + The referenced element is duplicated or not according to the
   //   release value on the <rhs>.
@@ -272,16 +272,13 @@ public:
   ~TAO_Object_Manager (void);
   // Destructor, only releases the object if <release_> is true.
 
-  TAO_Object_Manager<T,T_var> &operator= (const TAO_Object_Manager<T,T_var> &rhs);
+  TAO_Object_Manager<T> &operator= (const TAO_Object_Manager<T> &rhs);
   // Assignment from another managed type, only release if
   // <this->release_> is true.
   // @@ TODO what happens if rhs.release_ is true an this->relase_ is
   // false?
 
-  TAO_Object_Manager<T,T_var> &operator= (T *);
-  // Assignment from T *.
-
-  TAO_Object_Manager<T,T_var> &operator= (T_var &);
+  TAO_Object_Manager<T> &operator= (T *);
   // Assignment from T *.
 
   T * operator-> (void) const;
@@ -316,7 +313,7 @@ private:
 
 // *************************************************************
 
-template<class T,class T_var>
+template<class T>
 class TAO_Unbounded_Object_Sequence : public TAO_Unbounded_Base_Sequence
 {
   // = TITLE
@@ -371,7 +368,7 @@ public:
   // using the sequence allocbuf function, and the sequence will pass
   // it to freebuf when finished with it.
 
-  TAO_Unbounded_Object_Sequence(const TAO_Unbounded_Object_Sequence<T,T_var> &);
+  TAO_Unbounded_Object_Sequence(const TAO_Unbounded_Object_Sequence<T> &);
   // The copy constructor performs a deep copy from the existing
   // structure to create a new structure, including calling _duplicate
   // on all object  reference members and performing the necessary
@@ -386,7 +383,7 @@ public:
   // The destructor releases all object reference memebrs and frees
   // all string members.
 
-  TAO_Unbounded_Object_Sequence<T,T_var> &operator= (const TAO_Unbounded_Object_Sequence <T,T_var> &);
+  TAO_Unbounded_Object_Sequence<T> &operator= (const TAO_Unbounded_Object_Sequence <T> &);
   // The assignment operator first releases all object reference
   // members and frees all string members, and then performs a
   // deepcopy to create a new structure.
@@ -404,7 +401,7 @@ public:
   // the reallocation is performed. After reallocation, the release
   // flag is always set to TRUE.
 
-  TAO_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Object_Manager<T> operator[] (CORBA::ULong slot) const;
   // read-write accessor
 
   static T **allocbuf (CORBA::ULong);
@@ -441,7 +438,7 @@ public:
 
 // *************************************************************
 
-template<class T, class T_var,CORBA::ULong MAX>
+template<class T, CORBA::ULong MAX>
 class TAO_Bounded_Object_Sequence : public TAO_Bounded_Base_Sequence
 {
   // = TITLE
@@ -465,16 +462,16 @@ public:
                                CORBA::Boolean release=0);
   // Constructor from data.
 
-  TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T,T_var,MAX> &);
+  TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T,MAX> &);
   // Copy constructor.
 
   ~TAO_Bounded_Object_Sequence (void);
   // destructor
 
-  TAO_Bounded_Object_Sequence &operator= (const TAO_Bounded_Object_Sequence<T,T_var,MAX> &);
+  TAO_Bounded_Object_Sequence &operator= (const TAO_Bounded_Object_Sequence<T,MAX> &);
   // Assignment from another Bounded sequence.
 
-  TAO_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Object_Manager<T> operator[] (CORBA::ULong slot) const;
   // Read-write accessor.
 
   static T **allocbuf (CORBA::ULong length);
@@ -500,7 +497,7 @@ public:
 
 // *************************************************************
 
-template<class T,class T_var>
+template<class T>
 class TAO_Unbounded_Pseudo_Sequence : public TAO_Unbounded_Base_Sequence
 {
   // = TITLE
@@ -529,18 +526,18 @@ public:
                                  CORBA::Boolean release=0);
   // Constructor with a given buffer.
 
-  TAO_Unbounded_Pseudo_Sequence(const TAO_Unbounded_Pseudo_Sequence<T,T_var> &);
+  TAO_Unbounded_Pseudo_Sequence(const TAO_Unbounded_Pseudo_Sequence<T> &);
   // Copy ctor, deep copies.
 
   ~TAO_Unbounded_Pseudo_Sequence (void);
   // dtor releases all the contained elements.
 
-  TAO_Unbounded_Pseudo_Sequence<T,T_var> &operator= (const TAO_Unbounded_Pseudo_Sequence <T,T_var> &);
+  TAO_Unbounded_Pseudo_Sequence<T> &operator= (const TAO_Unbounded_Pseudo_Sequence <T> &);
   // The assignment operator first releases all object reference
   // members and frees all string members, and then performs a
   // deepcopy to create a new structure.
 
-  TAO_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Object_Manager<T> operator[] (CORBA::ULong slot) const;
   // read-write accessor
 
   static T **allocbuf (CORBA::ULong);
@@ -559,7 +556,7 @@ public:
 
 // *************************************************************
 
-template<class T, class T_var,CORBA::ULong MAX>
+template<class T, CORBA::ULong MAX>
 class TAO_Bounded_Pseudo_Sequence : public TAO_Bounded_Base_Sequence
 {
   // = TITLE
@@ -579,16 +576,16 @@ public:
                                CORBA::Boolean release=0);
   // Constructor from data.
 
-  TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> &);
+  TAO_Bounded_Pseudo_Sequence (const TAO_Bounded_Pseudo_Sequence<T,MAX> &);
   // Copy constructor.
 
   ~TAO_Bounded_Pseudo_Sequence (void);
   // destructor
 
-  TAO_Bounded_Pseudo_Sequence &operator= (const TAO_Bounded_Pseudo_Sequence<T,T_var,MAX> &);
+  TAO_Bounded_Pseudo_Sequence &operator= (const TAO_Bounded_Pseudo_Sequence<T,MAX> &);
   // Assignment from another Bounded sequence.
 
-  TAO_Object_Manager<T,T_var> operator[] (CORBA::ULong slot) const;
+  TAO_Object_Manager<T> operator[] (CORBA::ULong slot) const;
   // Read-write accessor.
 
   static T **allocbuf (CORBA::ULong length);
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index 7c27d89f237..c32f03bb038 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -209,65 +209,65 @@ 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
-TAO_Object_Manager<T,T_var>::~TAO_Object_Manager (void)
+template <class T> ACE_INLINE
+TAO_Object_Manager<T>::~TAO_Object_Manager (void)
 {
 }
 
-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)
+template <class T> ACE_INLINE
+TAO_Object_Manager<T>::TAO_Object_Manager (const TAO_Object_Manager<T> &rhs)
   : ptr_ (rhs.ptr_),
     release_ (rhs.release_)
 {
 }
 
-template <class T,class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::TAO_Object_Manager(T** buffer, CORBA::Boolean release)
+template <class T> ACE_INLINE
+TAO_Object_Manager<T>::TAO_Object_Manager(T** buffer, CORBA::Boolean release)
   : ptr_ (buffer),
     release_ (release)
 {
 }
 
-template <class T,class T_var> ACE_INLINE T *
-TAO_Object_Manager<T,T_var>::operator-> (void) const
+template <class T> ACE_INLINE T *
+TAO_Object_Manager<T>::operator-> (void) const
 {
   return *this->ptr_;
 }
 
-template <class T,class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator const T* () const // cast
+template <class T> ACE_INLINE
+TAO_Object_Manager<T>::operator const T* () const // cast
 {
   return *this->ptr_;
 }
 
-template <class T,class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator T* &() // cast
+template <class T> ACE_INLINE
+TAO_Object_Manager<T>::operator T* &() // cast
 {
   return *this->ptr_;
 }
 
-template <class T,class T_var> ACE_INLINE T *
-TAO_Object_Manager<T,T_var>::in (void) const
+template <class T> ACE_INLINE T *
+TAO_Object_Manager<T>::in (void) const
 {
   return *this->ptr_;
 }
 
-template <class T,class T_var> ACE_INLINE T *&
-TAO_Object_Manager<T,T_var>::inout (void)
+template <class T> ACE_INLINE T *&
+TAO_Object_Manager<T>::inout (void)
 {
   return *this->ptr_;
 }
 
-template <class T,class T_var> ACE_INLINE T *&
-TAO_Object_Manager<T,T_var>::out (void)
+template <class T> ACE_INLINE T *&
+TAO_Object_Manager<T>::out (void)
 {
   CORBA::release (*this->ptr_);
   *this->ptr_ = T::_nil ();
   return *this->ptr_;
 }
 
-template <class T,class T_var> ACE_INLINE T *
-TAO_Object_Manager<T,T_var>::_retn (void)
+template <class T> ACE_INLINE T *
+TAO_Object_Manager<T>::_retn (void)
 {
   T *temp = *this->ptr_;
   *this->ptr_ = T::_nil ();
@@ -279,13 +279,13 @@ TAO_Object_Manager<T,T_var>::_retn (void)
 // *************************************************************
 
 //default constructor
-template <class T,class T_var> ACE_INLINE
-TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (void)
+template <class T> ACE_INLINE
+TAO_Unbounded_Object_Sequence<T>::TAO_Unbounded_Object_Sequence (void)
 {
 }
 
-template <class T,class T_var> ACE_INLINE
-TAO_Unbounded_Object_Sequence<T,T_var>::
+template <class T> ACE_INLINE
+TAO_Unbounded_Object_Sequence<T>::
 TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
                                CORBA::ULong length,
                                T* *value,
@@ -294,26 +294,26 @@ TAO_Unbounded_Object_Sequence (CORBA::ULong maximum,
 {
 }
 
-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
+template <class T> ACE_INLINE TAO_Object_Manager<T>
+TAO_Unbounded_Object_Sequence<T>::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_);
+  return TAO_Object_Manager<T> (tmp + slot, this->release_);
 }
 
 // *************************************************************
 // class TAO_Bounded_Object_Sequence
 // *************************************************************
 
-template<class T, class T_var,CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::~TAO_Bounded_Object_Sequence (void)
+template<class T, CORBA::ULong MAX> ACE_INLINE
+TAO_Bounded_Object_Sequence<T,MAX>::~TAO_Bounded_Object_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template <class T, class T_var,CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_Object_Sequence<T,T_var,MAX>::
+template <class T, CORBA::ULong MAX> ACE_INLINE
+TAO_Bounded_Object_Sequence<T,MAX>::
 TAO_Bounded_Object_Sequence (CORBA::ULong length,
                              T **value,
                              CORBA::Boolean release)
@@ -321,12 +321,12 @@ TAO_Bounded_Object_Sequence (CORBA::ULong length,
 {
 }
 
-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
+template <class T, CORBA::ULong MAX> ACE_INLINE TAO_Object_Manager<T>
+TAO_Bounded_Object_Sequence<T, 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_);
+  return TAO_Object_Manager<T> (tmp + slot, this->release_);
 }
 
 // *************************************************************
@@ -334,13 +334,13 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator[] (CORBA::ULong slot) const
 // *************************************************************
 
 //default constructor
-template <class T,class T_var> ACE_INLINE
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::TAO_Unbounded_Pseudo_Sequence (void)
+template <class T> ACE_INLINE
+TAO_Unbounded_Pseudo_Sequence<T>::TAO_Unbounded_Pseudo_Sequence (void)
 {
 }
 
-template <class T,class T_var> ACE_INLINE
-TAO_Unbounded_Pseudo_Sequence<T,T_var>::
+template <class T> ACE_INLINE
+TAO_Unbounded_Pseudo_Sequence<T>::
 TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
                                CORBA::ULong length,
                                T* *value,
@@ -349,26 +349,26 @@ TAO_Unbounded_Pseudo_Sequence (CORBA::ULong maximum,
 {
 }
 
-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
+template <class T> ACE_INLINE TAO_Object_Manager<T>
+TAO_Unbounded_Pseudo_Sequence<T>::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_);
+  return TAO_Object_Manager<T> (tmp + slot, this->release_);
 }
 
 // *************************************************************
 // class TAO_Bounded_Pseudo_Sequence
 // *************************************************************
 
-template<class T, class T_var,CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::~TAO_Bounded_Pseudo_Sequence (void)
+template<class T, CORBA::ULong MAX> ACE_INLINE
+TAO_Bounded_Pseudo_Sequence<T,MAX>::~TAO_Bounded_Pseudo_Sequence (void)
 {
   this->_deallocate_buffer ();
 }
 
-template <class T, class T_var,CORBA::ULong MAX> ACE_INLINE
-TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::
+template <class T, CORBA::ULong MAX> ACE_INLINE
+TAO_Bounded_Pseudo_Sequence<T,MAX>::
 TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
                              T **value,
                              CORBA::Boolean release)
@@ -376,12 +376,12 @@ TAO_Bounded_Pseudo_Sequence (CORBA::ULong length,
 {
 }
 
-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
+template <class T, CORBA::ULong MAX> ACE_INLINE TAO_Object_Manager<T>
+TAO_Bounded_Pseudo_Sequence<T, 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_);
+  return TAO_Object_Manager<T> (tmp + slot, this->release_);
 }
 
 // *************************************************************
diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp
index 0a8b9f877a9..3c71da827a8 100644
--- a/TAO/tao/Servant_Base.cpp
+++ b/TAO/tao/Servant_Base.cpp
@@ -119,19 +119,14 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
   TAO_Stub *stub = 0;
 
   TAO_POA_Current_Impl *poa_current_impl =
-    TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
-
-  CORBA::ORB_ptr servant_orb = 0;
-
-  if (poa_current_impl != 0)
-    servant_orb = poa_current_impl->orb_core ().orb () ;
+    TAO_ORB_CORE_TSS_RESOURCES::instance ()->poa_current_impl_;
 
   if (poa_current_impl != 0 &&
       this == poa_current_impl->servant ())
     {
-      stub = servant_orb->create_stub_object (poa_current_impl->object_key (),
-                                              this->_interface_repository_id (),
-                                              ACE_TRY_ENV);
+      stub = poa_current_impl->orb_core ().orb ()->create_stub_object (poa_current_impl->object_key (),
+                                                                       this->_interface_repository_id (),
+                                                                       ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
     }
   else
@@ -150,9 +145,6 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
       stub->_incr_refcnt ();
     }
 
-  if (servant_orb == 0)
-    servant_orb = stub->orb_core ()->orb ();
-  stub->servant_orb (CORBA::ORB::_duplicate (servant_orb));
   return stub;
 }
 
@@ -188,14 +180,6 @@ TAO_ServantBase::_decrement_single_threaded_poa_lock_count (void)
     }
 }
 
-void *
-TAO_ServantBase::_create_collocated_objref (const char *,
-                                            CORBA::ULong,
-                                            TAO_Stub *)
-{
-  return 0;
-}
-
 TAO_RefCountServantBase::~TAO_RefCountServantBase (void)
 {
 }
@@ -341,14 +325,6 @@ TAO_Local_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
                                                                ACE_TRY_ENV);
 }
 
-void
-TAO_Local_ServantBase::_dispatch (CORBA::ServerRequest &request,
-                                  void *context,
-                                  CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::BAD_OPERATION ());
-}
-
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
 CORBA::Object_ptr
@@ -389,7 +365,7 @@ TAO_DynamicImplementation::_create_stub (CORBA::Environment &ACE_TRY_ENV)
   // by the DSI servant, it raises the PortableServer::WrongPolicy
   // exception.
   TAO_POA_Current_Impl *poa_current_impl =
-    TAO_TSS_RESOURCES::instance ()->poa_current_impl_;
+    TAO_ORB_CORE_TSS_RESOURCES::instance ()->poa_current_impl_;
 
   if (poa_current_impl != 0 &&
       this == poa_current_impl->servant ())
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
index b40fc0e691a..03b2f6ee396 100644
--- a/TAO/tao/Servant_Base.h
+++ b/TAO/tao/Servant_Base.h
@@ -1,3 +1,4 @@
+
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
@@ -59,11 +60,6 @@ public:
   virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This is an auxiliar method for _this() and _narrow().
 
-  virtual void * _create_collocated_objref (const char *repository_id,
-                                            CORBA::ULong type,
-                                            TAO_Stub *stub);
-  // Collocated object factory.
-
 protected:
   TAO_ServantBase (void);
   // Default constructor, only derived classes can be created.
@@ -96,6 +92,7 @@ protected:
   // Get this interface's repository id (TAO specific).
 
   // = Should be protected/private, but a nested class needs it.
+
 public:
   ACE_SYNCH_MUTEX &_single_threaded_poa_lock (void);
   // Access to the single threaded poa lock.
@@ -224,19 +221,14 @@ public:
   // Returns hash value.
 };
 
-class TAO_Export TAO_Local_ServantBase : public virtual TAO_ServantBase
+class TAO_Export TAO_Local_ServantBase : public TAO_ServantBase
 {
   // = TITLE
   //   Base class for local skeletons and servants.
 protected:
   TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
   // This is an auxiliar method for _this().  Make sure *not* to
-  // register with the default POA.
-
-  void _dispatch (CORBA::ServerRequest &request,
-                  void *context,
-                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  // Throws CORBA::BAD_OPERATION exception.
+  // register with the default POA
 };
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp
index ec63bbccc6f..3446a70016a 100644
--- a/TAO/tao/Server_Request.cpp
+++ b/TAO/tao/Server_Request.cpp
@@ -18,3 +18,14 @@
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID(tao, Server_Request, "$Id$")
+
+CORBA::Boolean
+CORBA::is_nil (CORBA_ServerRequest *x)
+{
+  return x != 0;
+}
+
+void
+CORBA::release (CORBA_ServerRequest *)
+{
+}
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index bb03b9812e5..577e2c4e9af 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -154,8 +154,7 @@ public:
   virtual unsigned int operation_length (void) const = 0;
   // get the length of the operation name
 
-  virtual void init_reply (CORBA_Environment &TAO_IN_ENV =
-                               TAO_default_environment ()) = 0;
+  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ()) = 0;
   // Start a Reply message.
 
   //  CORBA::Context_ptr ctx (void) = 0;
diff --git a/TAO/tao/Server_Request.i b/TAO/tao/Server_Request.i
index bc1d29d03be..b95ffc23940 100644
--- a/TAO/tao/Server_Request.i
+++ b/TAO/tao/Server_Request.i
@@ -11,17 +11,6 @@
 // IIOP_ServerRequest the "fast" version (with no copies at all). The
 // first would be use for DII and the later for SII.
 
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA_ServerRequest *x)
-{
-  return x != 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA_ServerRequest *)
-{
-}
-
 ACE_INLINE CORBA_ServerRequest *
 CORBA_ServerRequest::_duplicate (CORBA_ServerRequest *)
 {
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
index 000391f45fd..ff9a5dfe302 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -44,6 +44,12 @@ TAO_Server_Strategy_Factory::server_connection_thread_count (void)
 }
 
 ACE_Lock *
+TAO_Server_Strategy_Factory::create_servant_lock (void)
+{
+  return 0;
+}
+
+ACE_Lock *
 TAO_Server_Strategy_Factory::create_event_loop_lock (void)
 {
   return 0;
@@ -74,3 +80,4 @@ TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Objec
     use_active_hint_in_poa_names_ (1)
 {
 }
+
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
index 2e6b1a44bcf..604f6c1454a 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -102,6 +102,9 @@ public:
   virtual int server_connection_thread_count (void);
   // The thread activation parameters
 
+  virtual ACE_Lock *create_servant_lock (void);
+  // Creates and returns a lock for servants.
+
   virtual ACE_Lock *create_event_loop_lock (void);
   // Creates and returns a lock for the event loop.
 
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index f2bcad4868d..535fe466525 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -72,8 +72,7 @@ TAO_Stub::TAO_Stub (char *repository_id,
     refcount_ (1),
     use_locate_request_ (0),
     first_locate_request_ (0),
-    orb_core_ (orb_core),
-    servant_orb_ ()
+    orb_core_ (orb_core)
 #if defined (TAO_HAS_CORBA_MESSAGING)
     , policies_ (0)
 #endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index d3a20f523c4..b3b43d3d692 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -389,13 +389,6 @@ public:
   TAO_ORB_Core* orb_core (void) const;
   // Accessor
 
-  CORBA::ORB_ptr servant_orb (void);
-  void servant_orb (CORBA::ORB_ptr orb);
-  // Accesor and mutator for the servant ORB.  Notice that the muatator
-  // assumes the ownership of the passed in ORB and the accesor does not
-  // return a copy of the orb since the accessing of the ORB is considered
-  // temporary.
-
 protected:
   void put_params (CORBA_Environment &TAO_IN_ENV,
                    const TAO_Call_Data *info,
@@ -474,13 +467,6 @@ private:
   TAO_ORB_Core* orb_core_;
   // The ORB
 
-  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,
-  //   1. we know that the ORB will stay alive long enough, and,
-  //   2. we can search for the servant/POA's status starting from
-  //      the ORB's RootPOA.
-
 #if defined (TAO_HAS_CORBA_MESSAGING)
   TAO_Policy_Manager_Impl* policies_;
   // The policy overrides in this object, if nil then use the default
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
index 191cefcc7a0..1156b9dd630 100644
--- a/TAO/tao/Stub.i
+++ b/TAO/tao/Stub.i
@@ -254,19 +254,6 @@ TAO_Stub::orb_core (void) const
   return this->orb_core_;
 }
 
-ACE_INLINE CORBA::ORB_ptr
-TAO_Stub::servant_orb (void)
-{
-  // Simply pass back the ORB pointer for temporary use.
-  return this->servant_orb_.ptr ();
-}
-
-ACE_INLINE void
-TAO_Stub::servant_orb (CORBA::ORB_ptr orb)
-{
-  this->servant_orb_ = orb;
-}
-
 // Creator methods for TAO_Stub_Auto_Ptr (TAO_Stub Auto Pointer)
 ACE_INLINE
 TAO_Stub_Auto_Ptr::TAO_Stub_Auto_Ptr (TAO_Stub *p)
diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp
index b092b719946..be6ee5a8f6e 100644
--- a/TAO/tao/TAO.cpp
+++ b/TAO/tao/TAO.cpp
@@ -43,15 +43,15 @@ int
 TAO_ORB_Manager::init (int &argc,
                        char **argv,
                        const char *orb_name,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &env)
 {
   if (CORBA::is_nil (this->orb_.in ()))
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     orb_name,
-                                    ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
+                                    env);
+      TAO_CHECK_ENV_RETURN (env, -1);
     }
 
   if (CORBA::is_nil (this->poa_.in ()))
@@ -68,18 +68,18 @@ TAO_ORB_Manager::init (int &argc,
       // Get the POA object.
       this->poa_ =
         PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+                                      env);
 
-      ACE_CHECK_RETURN (-1);
+      TAO_CHECK_ENV_RETURN (env, -1);
     }
 
   if (CORBA::is_nil (this->poa_manager_.in ()))
     {
       // Get the POA_Manager.
       this->poa_manager_ =
-        this->poa_->the_POAManager (ACE_TRY_ENV);
+        this->poa_->the_POAManager (env);
 
-      ACE_CHECK_RETURN (-1);
+      TAO_CHECK_ENV_RETURN (env, -1);
     }
 
   return 0;
@@ -89,13 +89,13 @@ int
 TAO_ORB_Manager::init_child_poa (int& argc,
 				 char **argv,
 				 const char *poa_name,
-				 CORBA_Environment &ACE_TRY_ENV)
+				 CORBA_Environment &env)
 {
   return this->init_child_poa (argc,
                                argv,
                                poa_name,
                                0,
-                               ACE_TRY_ENV);
+                               env);
 }
 
 int
@@ -103,7 +103,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
 				 char **argv,
 				 const char *poa_name,
                                  const char *orb_name,
-				 CORBA_Environment &ACE_TRY_ENV)
+				 CORBA_Environment &env)
 {
   int init_result;
 
@@ -111,8 +111,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
   init_result = this->init (argc,
                             argv,
                             orb_name,
-                            ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                            env);
 
   if (init_result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -127,14 +126,14 @@ TAO_ORB_Manager::init_child_poa (int& argc,
   // Id Assignment policy
   policies[0] =
     this->poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                             ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                                             env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Lifespan policy
   policies[1] =
     this->poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                        ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                                        env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // We use a different POA, otherwise the user would have to change
   // the object key each time it invokes the server.
@@ -143,20 +142,20 @@ TAO_ORB_Manager::init_child_poa (int& argc,
     this->poa_->create_POA (poa_name,
                             this->poa_manager_.in (),
                             policies,
-                            ACE_TRY_ENV);
+                            env);
   // Warning!  If create_POA fails, then the policies won't be
   // destroyed and there will be hell to pay in memory leaks!
-  ACE_CHECK_RETURN (-1);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Creation of the new POAs over, so destroy the Policy_ptr's.
   for (CORBA::ULong i = 0;
-       i < policies.length ();
+       i < policies.length () && env.exception () == 0;
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
+      policy->destroy (env);
     }
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   return 0;
 }
@@ -164,10 +163,10 @@ TAO_ORB_Manager::init_child_poa (int& argc,
 // Activate POA manager.
 
 int
-TAO_ORB_Manager::activate_poa_manager (CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Manager::activate_poa_manager (CORBA_Environment &env)
 {
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->poa_manager_->activate (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
   return 0;
 }
 
@@ -175,22 +174,22 @@ TAO_ORB_Manager::activate_poa_manager (CORBA_Environment &ACE_TRY_ENV)
 
 CORBA::String
 TAO_ORB_Manager::activate (PortableServer::Servant servant,
-                           CORBA_Environment &ACE_TRY_ENV)
+                           CORBA_Environment &env)
 {
   PortableServer::ObjectId_var id =
     this->poa_->activate_object (servant,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+                                 env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   CORBA::Object_var obj =
     this->poa_->id_to_reference (id.in (),
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+                                 env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   CORBA::String str =
     this->orb_->object_to_string (obj.in (),
-                                  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+                                  env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   return str;
 }
@@ -217,7 +216,7 @@ TAO_ORB_Manager::deactivate (const char *id,
 CORBA::String
 TAO_ORB_Manager::activate_under_child_poa (const char* object_name,
                                            PortableServer::Servant servant,
-                                           CORBA_Environment& ACE_TRY_ENV)
+                                           CORBA_Environment& env)
 {
   if (object_name == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -230,19 +229,19 @@ TAO_ORB_Manager::activate_under_child_poa (const char* object_name,
 
   this->child_poa_->activate_object_with_id (id.in (),
                                              servant,
-                                             ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+                                             env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   CORBA::Object_var obj =
     this->child_poa_->id_to_reference (id.in (),
-                                       ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+                                       env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   CORBA::String str =
     this->orb_->object_to_string (obj.in (),
-                                  ACE_TRY_ENV);
+                                  env);
 
-  ACE_CHECK_RETURN (0);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   return str;
 }
@@ -267,11 +266,11 @@ TAO_ORB_Manager::deactivate_under_child_poa (const char *id,
 // Enter the ORB event loop.
 
 int
-TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV,
+TAO_ORB_Manager::run (CORBA_Environment &env,
                       ACE_Time_Value *tv)
 {
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->poa_manager_->activate (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   if (this->orb_->run (tv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -283,10 +282,10 @@ TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV,
 
 int
 TAO_ORB_Manager::run (ACE_Time_Value &tv,
-                      CORBA_Environment &ACE_TRY_ENV)
+                      CORBA_Environment &env)
 {
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->poa_manager_->activate (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   if (this->orb_->run (tv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -297,10 +296,10 @@ TAO_ORB_Manager::run (ACE_Time_Value &tv,
 }
 
 int
-TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Manager::run (CORBA_Environment &env)
 {
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->poa_manager_->activate (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   if (this->orb_->run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -332,20 +331,14 @@ TAO_ORB_Manager::child_poa (void)
   return PortableServer::POA::_duplicate (this->child_poa_.in ());
 }
 
-PortableServer::POAManager_ptr
-TAO_ORB_Manager::poa_manager (void)
-{
-  return PortableServer::POAManager::_duplicate (this->poa_manager_.in ());
-}
-
 // Destructor.
 
 TAO_ORB_Manager::~TAO_ORB_Manager (void)
 {
-  CORBA::Environment ACE_TRY_ENV;
+  CORBA::Environment env;
 
   if (CORBA::is_nil (this->poa_.in ()) == 0)
     this->poa_->destroy (1,
                          1,
-                         ACE_TRY_ENV);
+                         env);
 }
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 3e766b78a86..049941a743a 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -299,36 +299,6 @@ SOURCE=.\Context.cpp
 # 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"

@@ -824,36 +794,6 @@ SOURCE=.\Invocation.cpp
 # 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

 

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

@@ -1409,21 +1349,6 @@ SOURCE=.\Stub.cpp
 # 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"

@@ -1659,14 +1584,6 @@ SOURCE=.\Context.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\corba.h

 # End Source File

 # Begin Source File

@@ -1783,14 +1700,6 @@ SOURCE=.\Invocation.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\IOR_LookupTable.h

 # End Source File

 # Begin Source File

@@ -1955,10 +1864,6 @@ SOURCE=.\stub.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Components.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO.h

 # End Source File

 # Begin Source File

@@ -2027,14 +1932,6 @@ SOURCE=.\Context.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\corbafwd.i

 # End Source File

 # Begin Source File

@@ -2087,14 +1984,6 @@ SOURCE=.\IIOP_ORB.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Managed_Types.i

 # End Source File

 # Begin Source File

@@ -2191,10 +2080,6 @@ SOURCE=.\stub.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Components.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO_Internal.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h
index 86f56a2de42..bf06aee10e6 100644
--- a/TAO/tao/TAO.h
+++ b/TAO/tao/TAO.h
@@ -46,21 +46,21 @@ public:
 
   int init (int &argc,
             char *argv[],
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+            CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Initialize the ORB/root POA, using the supplied command line
   // arguments or the default ORB components.  Returns -1 on failure.
 
   int init (int &argc,
             char *argv[],
             const char *orb_name,
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+            CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Initialize the ORB/root POA, using the supplied command line
   // arguments or the default ORB components.  Returns -1 on failure.
 
   int init_child_poa (int &argc,
                       char *argv[],
                       const char *poa_name,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                      CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Creates a child poa under the root poa with PERSISTENT and
   // USER_ID policies.  Call this if you want a <child_poa> with the
   // above policies, otherwise call init.  Returns -1 on failure.
@@ -69,12 +69,12 @@ public:
                       char *argv[],
                       const char *poa_name,
                       const char *orb_name,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                      CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Creates a child poa under the root poa with PERSISTENT and
   // USER_ID policies.  Call this if you want a <child_poa> with the
   // above policies, otherwise call init.  Returns -1 on failure.
 
-  int activate_poa_manager (CORBA_Environment &ACE_TRY_ENV =
+  int activate_poa_manager (CORBA_Environment &TAO_IN_ENV =
                             TAO_default_environment ());
   //  Put POA manager into the <Active> state, so that incoming corba
   //  requests are processed.  This method is useful for clients,
@@ -83,56 +83,43 @@ public:
   //  call on a server.  Returns -1 on failure.
 
   CORBA::String activate (PortableServer::Servant servant,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Activate <servant>, using the POA <activate_object> call.  Users
   // can call this method multiple times to activate multiple objects.
   // Returns 0 on failure.
 
   void deactivate (const char *id,
-                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Deactivate object in RootPOA.
 
   CORBA::String activate_under_child_poa (const char *servant_name,
                                           PortableServer::Servant servant,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                          CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Precondition: init_child_poa has been called.  Activate <servant>
   // using the POA <activate_object_with_id> created from the string
   // servant_name. Users should call this to activate objects under
   // the child_poa.
 
   void deactivate_under_child_poa (const char *id,
-                                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Deactivate object in child POA.
 
-  int run (CORBA_Environment &ACE_TRY_ENV,
+  int run (CORBA_Environment &TAO_IN_ENV,
            ACE_Time_Value *tv);
   int run (ACE_Time_Value &tv,
-           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  int run (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+           CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
+  int run (CORBA_Environment &TAO_IN_ENV = TAO_default_environment ());
   // Run the ORB event loop with the specified <tv> time value Returns
   // -1 on failure.
 
   CORBA::ORB_ptr orb (void);
-  // Accessor which returns the ORB pointer.  Following the normal
-  // CORBA memory management rules of return values from functions,
-  // this function duplicates the orb return value before returning
-  // it.
+  // Accessor which returns the ORB pointer.
 
   PortableServer::POA_ptr root_poa (void);
-  // Accessor which returns the root poa. Following the normal CORBA
-  // memory management rules of return values from functions, this
-  // function duplicates the poa return value before returning it.
+  // Accessor which returns the root poa
 
   PortableServer::POA_ptr child_poa (void);
-  // Accessor which returns the child poa. Following the normal CORBA
-  // memory management rules of return values from functions, this
-  // function duplicates the poa return value before returning it.
-
-  PortableServer::POAManager_ptr poa_manager (void);
-  // Accessor which returns the poa manager. Following the normal
-  // CORBA memory management rules of return values from functions,
-  // this function duplicates the poa manager return value before
-  // returning it.
+  // Accessor which returns the child poa
 
 protected:
   CORBA::ORB_var orb_;
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index f863ac0e34e..06538e6899d 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -122,14 +122,6 @@ SOURCE=.\Context.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\corbafwd.cpp

 # End Source File

 # Begin Source File

@@ -262,14 +254,6 @@ SOURCE=.\Invocation.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\IOR_LookupTable.cpp

 # End Source File

 # Begin Source File

@@ -414,10 +398,6 @@ SOURCE=.\Stub.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Components.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO.cpp

 # End Source File

 # Begin Source File

@@ -510,14 +490,6 @@ SOURCE=.\Connector_Registry.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\corba.h

 # End Source File

 # Begin Source File

@@ -626,14 +598,6 @@ SOURCE=.\Invocation.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Managed_Types.h

 # End Source File

 # Begin Source File

@@ -790,10 +754,6 @@ SOURCE=.\stub.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Components.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO.h

 # End Source File

 # Begin Source File

@@ -858,14 +818,6 @@ SOURCE=.\cdr.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\CONV_FRAMEC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CONV_FRAMES.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\corbafwd.i

 # End Source File

 # Begin Source File

@@ -926,14 +878,6 @@ SOURCE=.\Invocation.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOPC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\IOPS.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Managed_Types.i

 # End Source File

 # Begin Source File

@@ -1042,10 +986,6 @@ SOURCE=.\stub.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Tagged_Components.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\TAO_Internal.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp
deleted file mode 100644
index 1f69321af74..00000000000
--- a/TAO/tao/Tagged_Components.cpp
+++ /dev/null
@@ -1,293 +0,0 @@
-// $Id$
-
-#include "tao/Tagged_Components.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Tagged_Components.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Tagged_Components, "$Id$")
-
-
-void
-TAO_Tagged_Components::set_orb_type (CORBA::ULong orb_type)
-{
-  this->orb_type_ = orb_type;
-  this->orb_type_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->orb_type_;
-
-  this->set_component_i (IOP::TAG_ORB_TYPE, cdr);
-}
-
-void
-TAO_Tagged_Components::set_code_sets (
-    const CONV_FRAME::CodeSetComponentInfo &ci)
-{
-  this->code_sets_ = ci;
-  this->code_sets_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->code_sets_;
-
-  this->set_component_i (IOP::TAG_CODE_SETS, cdr);
-}
-
-void
-TAO_Tagged_Components::set_code_sets (CONV_FRAME::CodeSetComponentInfo &ci)
-{
-  this->set_code_sets_i (this->code_sets_.ForCharData,
-                         ci.ForCharData);
-  this->set_code_sets_i (this->code_sets_.ForWcharData,
-                         ci.ForWcharData);
-  this->code_sets_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->code_sets_;
-
-  this->set_component_i (IOP::TAG_CODE_SETS, cdr);
-}
-
-void
-TAO_Tagged_Components::set_code_sets_i (
-    CONV_FRAME::CodeSetComponent &lhs,
-    CONV_FRAME::CodeSetComponent &rhs)
-{
-  lhs.native_code_set = rhs.native_code_set;
-  CORBA::ULong max = rhs.conversion_code_sets.maximum ();
-  CORBA::ULong len = rhs.conversion_code_sets.length ();
-  CONV_FRAME::CodeSetId *buffer = rhs.conversion_code_sets.get_buffer (1);
-  lhs.conversion_code_sets.replace (max, len, buffer, 1);
-}
-
-void
-TAO_Tagged_Components::set_tao_priority_range (CORBA::Short min_p,
-                                               CORBA::Short max_p)
-{
-  this->tao_priority_min_ = min_p;
-  this->tao_priority_max_ = max_p;
-  this->tao_priority_range_set_ = 1;
-
-  TAO_OutputCDR cdr;
-  cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
-  cdr << this->orb_type_;
-
-  cdr << this->tao_priority_min_;
-  cdr << this->tao_priority_max_;
-
-  this->set_component_i (TAO_TAG_PRIORITY_RANGE, cdr);
-}
-
-// ****************************************************************
-
-void
-TAO_Tagged_Components::set_component_i (IOP::ComponentId tag,
-                                        TAO_OutputCDR &cdr)
-{
-  IOP::TaggedComponent component;
-  component.tag = tag;
-
-  // Make a *copy* of the CDR stream...
-  CORBA::ULong length = cdr.total_length ();
-  component.component_data.length (length);
-  CORBA::Octet *buf = component.component_data.get_buffer ();
-
-  for (const ACE_Message_Block *i = cdr.begin ();
-       i != 0;
-       i = i->cont ())
-    {
-      ACE_OS::memcpy (buf, i->rd_ptr (), i->length ());
-      buf += i->length ();
-    }
-
-  this->set_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_component (const IOP::TaggedComponent& component)
-{
-  if (this->known_tag (component.tag))
-    this->set_known_component_i (component);
-  if (this->unique_tag (component.tag))
-    this->set_component_i (component);
-  else
-    this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_component (IOP::TaggedComponent& component)
-{
-  if (this->known_tag (component.tag))
-    this->set_known_component_i (component);
-  if (this->unique_tag (component.tag))
-    this->set_component_i (component);
-  else
-    this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_known_component_i (
-    const IOP::TaggedComponent& component)
-{
-  TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                          component.component_data.get_buffer ()),
-                    component.component_data.length ());
-  CORBA::Octet byte_order;
-  if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) != 0)
-    return;
-  cdr.reset_byte_order (ACE_static_cast(int,byte_order));
-
-  if (component.tag == IOP::TAG_ORB_TYPE)
-    {
-      CORBA::ULong orb_type;
-      if ((cdr >> orb_type) != 0)
-        return;
-
-      this->orb_type_ = orb_type;
-      this->orb_type_set_ = 1;
-    }
-  else if (component.tag == IOP::TAG_CODE_SETS)
-    {
-      CONV_FRAME::CodeSetComponentInfo ci;
-      if ((cdr >> ci) != 0)
-        return;
-
-      this->set_code_sets_i (this->code_sets_.ForCharData,
-                             ci.ForCharData);
-      this->set_code_sets_i (this->code_sets_.ForWcharData,
-                             ci.ForWcharData);
-      this->code_sets_set_ = 1;
-    }
-  else if (component.tag == TAO_TAG_PRIORITY_RANGE)
-    {
-      CORBA::Short min_p, max_p;
-
-      if ((cdr >> min_p) != 0
-          || (cdr >> max_p) != 0
-          || min_p > max_p)
-        return;
-
-      this->tao_priority_min_ = min_p;
-      this->tao_priority_max_ = max_p;
-      this->tao_priority_range_set_ = 1;
-    }
-}
-
-void
-TAO_Tagged_Components::set_component_i (const IOP::TaggedComponent& component)
-{
-  // @@ TODO Some components can show up multiple times, others
-  //    can't find out and take appropiate action.
-  for (CORBA::ULong i = 0; i != this->components_.length (); ++i)
-    {
-      if (component.tag == this->components_[i].tag)
-        {
-          this->components_[i] = component;
-          return;
-        }
-    }
-  this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::set_component_i (IOP::TaggedComponent& component)
-{
-  for (CORBA::ULong i = 0; i != this->components_.length (); ++i)
-    {
-      if (component.tag == this->components_[i].tag)
-        {
-          CORBA::ULong max = component.component_data.maximum ();
-          CORBA::ULong len = component.component_data.length ();
-          CORBA::Octet* buf = component.component_data.get_buffer (1);
-          this->components_[i].component_data.replace (max, len, buf, 1);
-          return;
-        }
-    }
-  this->add_component_i (component);
-}
-
-void
-TAO_Tagged_Components::add_component_i (IOP::TaggedComponent& component)
-{
-  // @@ TODO Some components can show up multiple times, others
-  //    can't find out and take appropiate action.
-  CORBA::ULong l = this->components_.length ();
-  this->components_.length (l + 1);
-  this->components_[l].tag = component.tag;
-  CORBA::ULong max = component.component_data.maximum ();
-  CORBA::ULong len = component.component_data.length ();
-  CORBA::Octet* buf = component.component_data.get_buffer (1);
-  this->components_[l].component_data.replace (max, len, buf, 1);
-}
-
-void
-TAO_Tagged_Components::add_component_i (const IOP::TaggedComponent& component)
-{
-  // @@ TODO Some components can show up multiple times, others
-  //    can't find out and take appropiate action.
-  CORBA::ULong l = this->components_.length ();
-  this->components_.length (l + 1);
-  this->components_[l] = component;
-}
-
-int
-TAO_Tagged_Components::get_component (IOP::TaggedComponent& component) const
-{
-  for (CORBA::ULong i = 0; i != this->components_.length (); ++i)
-    {
-      if (component.tag == this->components_[i].tag)
-        {
-          component = this->components_[i];
-          return 1;
-        }
-    }
-  return 0;
-}
-
-// ****************************************************************
-
-int
-TAO_Tagged_Components::encode (TAO_OutputCDR& cdr) const
-{
-  return (cdr << this->components_);
-}
-
-int
-TAO_Tagged_Components::decode (TAO_InputCDR& cdr)
-{
-  // Mark the well-known components as removed
-  this->orb_type_set_ = 0;
-  this->code_sets_set_ = 0;
-  this->tao_priority_range_set_ = 0;
-
-  if ((cdr >> this->components_) == 0)
-    return 0;
-
-  CORBA::ULong l = this->components_.length ();
-  for (CORBA::ULong i = 0; i != l; ++i)
-    {
-      const IOP::TaggedComponent &component =
-        this->components_[i];
-      if (this->known_tag (component.tag))
-        this->set_known_component_i (component);
-    }
-  return 1;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Unbounded_Sequence<IOP::TaggedComponent>;
-template class TAO_Unbounded_Sequence<IOP::TaggedProfile>;
-template class TAO_Unbounded_Sequence<IOP::ServiceContext>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#pragma instantiate TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#pragma instantiate TAO_Unbounded_Sequence<IOP::ServiceContext>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h
deleted file mode 100644
index b3517be0db2..00000000000
--- a/TAO/tao/Tagged_Components.h
+++ /dev/null
@@ -1,153 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Tagged_Components.h
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_TAGGED_COMPONENTS_H
-#define TAO_TAGGED_COMPONENTS_H
-
-#include "tao/IOPC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CONV_FRAMEC.h"
-
-class TAO_Export TAO_Tagged_Components
-{
-  //
-  // = TITLE
-  //   The policy manager implementation.
-  //
-  // = DESCRIPTION
-  //   This class is used to manipulate and access the <components>
-  //   field of an IIOP profile (and other GIOP profiles).
-  //   The definition for that field is simply a sequence of the
-  //   following structures:
-  //
-  //   typedef unsigned long ComponentId;
-  //   struct TaggedComponent {
-  //   ComponentId     tag;
-  //   sequence<octet> component_data;
-  //   };
-  //
-  //   the real motivation is to minimize the marshaling and
-  //   demarshaling of the <component_data> field for certain critical
-  //   components.
-  //
-public:
-  TAO_Tagged_Components (void);
-  // Constructor
-
-  // = Standard OMG that require fast access.
-  void set_orb_type (CORBA::ULong orb_type);
-  // The the IOP::TAG_ORB_TYPE component value
-
-  int get_orb_type (CORBA::ULong& orb_type) const;
-  // Gets the IOP::TAG_ORB_TYPE component value, return 0 if the
-  // component is not present.
-
-  void set_code_sets (const CONV_FRAME::CodeSetComponentInfo &);
-  void set_code_sets (CONV_FRAME::CodeSetComponentInfo &);
-  // The the IOP::TAG_CODE_SETS component value, the first version
-  // copies the data, the second version steal all the sequence
-  // buffers.
-
-  int get_code_sets (const CONV_FRAME::CodeSetComponentInfo* &) const;
-  // Gets a reference of the IOP::TAG_CODE_SETS component value,
-  // return 0 if the component is not present.
-
-  int get_code_sets (CONV_FRAME::CodeSetComponentInfo &) const;
-  // Gets a copy of the IOP::TAG_CODE_SETS component value, return 0
-  // if the component is not present.
-
-  // = TAO specific components
-  void set_tao_priority_range (CORBA::Short min_priority,
-                               CORBA::Short max_priority);
-  // The the TAO_TAG_PRIORITY_RANGE component value.
-
-  int get_tao_priority_range (CORBA::Short& min_priority,
-                              CORBA::Short& max_priority) const;
-  // Gets the TAO_TAG_PRIORITY_RANGE component value.
-
-  // = Generic components
-
-  void set_component (const IOP::TaggedComponent& component);
-  // Insert the component into the list, making a copy of the octet
-  // sequence.
-
-  void set_component (IOP::TaggedComponent& component);
-  // Insert the component into the list, but efficiently stealing the
-  // contents of the octet sequence.
-
-  int get_component (IOP::TaggedComponent& component) const;
-  // Get a copy of the component identified by <component.tag>, return
-  // 0 if the component is not present.
-
-  // = Marshaling and demarshaling
-
-  int encode (TAO_OutputCDR& cdr) const;
-  int decode (TAO_InputCDR& cdr);
-  // Marshal and demarshal the list.
-
-private:
-  void set_code_sets_i (CONV_FRAME::CodeSetComponent &lhs,
-                        CONV_FRAME::CodeSetComponent &rhs);
-  // Helper method to implement set_code_sets()
-
-  void set_known_component_i (const IOP::TaggedComponent& component);
-  void set_component_i (const IOP::TaggedComponent& component);
-  void set_component_i (IOP::TaggedComponent& component);
-  void add_component_i (const IOP::TaggedComponent& component);
-  void add_component_i (IOP::TaggedComponent& component);
-  void set_component_i (IOP::ComponentId tag, TAO_OutputCDR &cdr);
-  // Helper methods to implement set_component()
-
-  int get_known_component_i (IOP::TaggedComponent& component) const;
-  int get_component_i (IOP::TaggedComponent& component) const;
-  // Helper methods to implement set_component()
-
-  int known_tag (IOP::ComponentId tag) const;
-  // Is <tag> a well-known component?
-
-  int unique_tag (IOP::ComponentId tag) const;
-  // Does <tag> show up only once?
-
-private:
-  CORBA::ULong orb_type_;
-  // The ORB_TYPE component value
-
-  CONV_FRAME::CodeSetComponentInfo code_sets_;
-  // The ORB_TYPE component value
-
-  CORBA::Short tao_priority_min_;
-  CORBA::Short tao_priority_max_;
-  // The TAO_PRIORITY_RANGE priorities
-
-  IOP::MultipleComponentProfile components_;
-  // The rest of the components, to be compliant we cannot drop a
-  // bunch of them.
-
-  // A flag for each component...
-  unsigned int orb_type_set_  : 1;
-  unsigned int code_sets_set_ : 1;
-  unsigned int tao_priority_range_set_ : 1;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Tagged_Components.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_TAGGED_COMPONENTS_H */
diff --git a/TAO/tao/Tagged_Components.i b/TAO/tao/Tagged_Components.i
deleted file mode 100644
index d876667d609..00000000000
--- a/TAO/tao/Tagged_Components.i
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Tagged_Components::TAO_Tagged_Components (void)
-  :  orb_type_ (0),
-     tao_priority_min_ (0),
-     tao_priority_max_ (0),
-     orb_type_set_ (0),
-     code_sets_set_ (0),
-     tao_priority_range_set_ (0)
-{
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_orb_type (CORBA::ULong& orb_type) const
-{
-  if (this->orb_type_set_ == 1)
-    orb_type = this->orb_type_;
-  return this->orb_type_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_tao_priority_range (CORBA::Short& min_p,
-                                               CORBA::Short& max_p) const
-{
-  if (this->tao_priority_range_set_ == 1)
-    {
-      min_p = this->tao_priority_min_;
-      max_p = this->tao_priority_max_;
-    }
-  return this->tao_priority_range_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_code_sets (const CONV_FRAME::CodeSetComponentInfo* &ci) const
-{
-  if (this->code_sets_set_ == 1)
-    ci = &this->code_sets_;
-  return this->code_sets_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::get_code_sets (CONV_FRAME::CodeSetComponentInfo &ci) const
-{
-  if (this->code_sets_set_ == 1)
-    ci = this->code_sets_;
-  return this->code_sets_set_;
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::known_tag (IOP::ComponentId tag) const
-{
-  return (tag == IOP::TAG_ORB_TYPE
-          || tag == IOP::TAG_CODE_SETS
-          || tag == TAO_TAG_PRIORITY_RANGE);
-}
-
-ACE_INLINE int
-TAO_Tagged_Components::unique_tag (IOP::ComponentId tag) const
-{
-  return (tag == IOP::TAG_ORB_TYPE
-          || tag == IOP::TAG_CODE_SETS
-          || tag == TAO_TAG_PRIORITY_RANGE
-          || tag == IOP::TAG_POLICIES
-          // || tag == IOP::TAG_ALTERNATE_IIOP_ADDRESS
-          || tag == IOP::TAG_ASSOCIATION_OPTIONS
-          || tag == IOP::TAG_SEC_NAME
-          || tag == IOP::TAG_SPKM_1_SEC_MECH
-          || tag == IOP::TAG_SPKM_2_SEC_MECH
-          || tag == IOP::TAG_KerberosV5_SEC_MECH
-          || tag == IOP::TAG_CSI_ECMA_Secret_SEC_MECH
-          || tag == IOP::TAG_CSI_ECMA_Hybrid_SEC_MECH
-          || tag == IOP::TAG_SSL_SEC_TRANS
-          || tag == IOP::TAG_CSI_ECMA_Public_SEC_MECH
-          || tag == IOP::TAG_GENERIC_SEC_MECH
-
-          || tag == IOP::TAG_COMPLETE_OBJECT_KEY
-          || tag == IOP::TAG_ENDPOINT_ID_POSITION
-          || tag == IOP::TAG_LOCATION_POLICY
-          || tag == IOP::TAG_DCE_STRING_BINDING
-          || tag == IOP::TAG_DCE_BINDING_NAME
-          || tag == IOP::TAG_DCE_NO_PIPES
-          || tag == IOP::TAG_DCE_SEC_MECH);
-}
diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp
index f08cc37b575..9133f0cc6a1 100644
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -54,24 +54,24 @@ 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)
+                               TAO_InputCDR* cdr)
 {
   // @@
   return -1;
 }
 
-TAO_GIOP_Message_State *
-TAO_Muxed_TMS::get_message_state (void)
+TAO_InputCDR *
+TAO_Muxed_TMS::get_cdr_stream (void)
 {
   return 0;
 }
 
 void
-TAO_Muxed_TMS::destroy_message_state (TAO_GIOP_Message_State *)
+TAO_Muxed_TMS::destroy_cdr_stream (TAO_InputCDR *)
 {
   // @@ Implement.
-  // delete message_state;
-  // message_state = 0;
+  // delete cdr;
+  // cdr = 0;
 }
 
 // *********************************************************************
@@ -111,7 +111,7 @@ 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_InputCDR* cdr)
 {
   if (this->request_id_ != request_id)
     {
@@ -129,20 +129,20 @@ TAO_Exclusive_TMS::dispatch_reply (CORBA::ULong request_id,
   return rd->dispatch_reply (reply_status,
                              version,
                              reply_ctx,
-                             message_state);
+                             cdr);
 }
 
-TAO_GIOP_Message_State *
-TAO_Exclusive_TMS::get_message_state (void)
+TAO_InputCDR *
+TAO_Exclusive_TMS::get_cdr_stream (void)
 {
   if (this->rd_ == 0)
     return 0;
 
-  return this->rd_->message_state ();
+  return this->rd_->cdr ();
 }
 
 // NOOP function.
 void
-TAO_Exclusive_TMS::destroy_message_state (TAO_GIOP_Message_State *)
+TAO_Exclusive_TMS::destroy_cdr_stream (TAO_InputCDR *)
 {
 }
diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
index 8cdb605aec9..f7d92ae34ef 100644
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ b/TAO/tao/Transport_Mux_Strategy.h
@@ -26,6 +26,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class TAO_Reply_Dispatcher;
+struct TAO_GIOP_Version;
+class TAO_InputCDR;
 
 class TAO_Export TAO_Transport_Mux_Strategy
 {
@@ -61,7 +63,7 @@ public:
                               CORBA::ULong reply_status,
                               const TAO_GIOP_Version& version,
                               TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state) = 0;
+                              TAO_InputCDR* cdr) = 0;
   // Dispatch the reply for <request_id>, cleanup any resources
   // allocated for that request.
 
@@ -69,10 +71,10 @@ public:
   //    the factory simply allocates a new one, in the Exclusive case
   //    the factory returns a pointer to the pre-allocated CDR.
 
-  virtual TAO_GIOP_Message_State *get_message_state (void) = 0;
+  virtual TAO_InputCDR *get_cdr_stream (void) = 0;
   // Get a CDR stream.
 
-  virtual void destroy_message_state (TAO_GIOP_Message_State *) = 0;
+  virtual void destroy_cdr_stream (TAO_InputCDR *) = 0;
   // Destroy a CDR stream.
 };
 
@@ -100,9 +102,9 @@ public:
                               CORBA::ULong reply_status,
                               const TAO_GIOP_Version& version,
                               TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state);
-  virtual TAO_GIOP_Message_State *get_message_state (void);
-  virtual void destroy_message_state (TAO_GIOP_Message_State *);
+                              TAO_InputCDR* cdr);
+  virtual TAO_InputCDR *get_cdr_stream (void);
+  virtual void destroy_cdr_stream (TAO_InputCDR *);
 
 protected:
   // @@ HASH TABLE???
@@ -132,9 +134,9 @@ public:
                               CORBA::ULong reply_status,
                               const TAO_GIOP_Version& version,
                               TAO_GIOP_ServiceContextList& reply_ctx,
-                              TAO_GIOP_Message_State* message_state);
-  virtual TAO_GIOP_Message_State *get_message_state (void);
-  virtual void destroy_message_state (TAO_GIOP_Message_State *);
+                              TAO_InputCDR* cdr);
+  virtual TAO_InputCDR *get_cdr_stream (void);
+  virtual void destroy_cdr_stream (TAO_InputCDR *);
 
 protected:
   CORBA::ULong request_id_generator_;
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index f292baeed92..57a76a39d76 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -26,6 +26,20 @@
 
 ACE_RCSID(tao, Typecode, "$Id$")
 
+void
+CORBA::release (CORBA::TypeCode_ptr tc)
+{
+  if (tc)
+    tc->_decr_refcnt ();
+}
+
+// returns true if the typecode is NULL
+CORBA::Boolean
+CORBA::is_nil (CORBA::TypeCode_ptr tc)
+{
+  return tc == 0;
+}
+
 CORBA_TypeCode::Bounds::Bounds (void)
   : CORBA_UserException (CORBA::TypeCode::_tc_Bounds)
 {
@@ -295,42 +309,43 @@ CORBA_TypeCode::~CORBA_TypeCode (void)
 // Returns true if the two unaliased typecodes are equal.
 CORBA::Boolean
 CORBA_TypeCode::equivalent (CORBA::TypeCode_ptr tc,
-			    CORBA::Environment &ACE_TRY_ENV) const
+			    CORBA::Environment &env) const
 {
   const CORBA::TypeCode* rcvr = this;
   CORBA::Boolean status = 0;
 
   if (this->kind_ == CORBA::tk_alias)
     {
-      rcvr = this->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      rcvr = this->content_type (env);
+      // @@EXC@@ Is returning FALSE the right choice?
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      status = (rcvr->kind (ACE_TRY_ENV) == CORBA::tk_alias);
-      ACE_CHECK_RETURN (0);
+      status = (rcvr->kind (env) == CORBA::tk_alias);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
       while (status)
         {
-          rcvr = rcvr->content_type (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          rcvr = rcvr->content_type (env);
+          TAO_CHECK_ENV_RETURN (env, 0);
 
-          status = (rcvr->kind (ACE_TRY_ENV) == CORBA::tk_alias);
-          ACE_CHECK_RETURN (0);
+          status = (rcvr->kind (env) == CORBA::tk_alias);
+          TAO_CHECK_ENV_RETURN (env, 0);
         }
     }
 
-  status = (tc->kind (ACE_TRY_ENV) == CORBA::tk_alias);
-  ACE_CHECK_RETURN (0);
+  status = (tc->kind (env) == CORBA::tk_alias);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   while (status)
     {
-      tc = tc->content_type (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      tc = tc->content_type (env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      status = (tc->kind (ACE_TRY_ENV) == CORBA::tk_alias);
-      ACE_CHECK_RETURN (0);
+      status = (tc->kind (env) == CORBA::tk_alias);
+      TAO_CHECK_ENV_RETURN (env, 0);
     }
 
-  return rcvr->equal (tc, ACE_TRY_ENV);
+  return rcvr->equal (tc, env);
 }
 
 // Return the i-th member typecode if it exists, else raise an
@@ -340,7 +355,7 @@ CORBA_TypeCode::equivalent (CORBA::TypeCode_ptr tc,
 
 CORBA::TypeCode_ptr
 CORBA_TypeCode::member_type (CORBA::ULong slot,
-                             CORBA::Environment &ACE_TRY_ENV) const
+                             CORBA::Environment &env) const
 {
   if (this->private_state_->tc_member_count_known_
       && this->private_state_->tc_member_type_list_known_)
@@ -348,17 +363,17 @@ CORBA_TypeCode::member_type (CORBA::ULong slot,
       if (slot < this->private_state_->tc_member_count_)
         return this->private_state_->tc_member_type_list_[slot];
       else
-        ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+        TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
     }
   else
-    return this->private_member_type (slot, ACE_TRY_ENV);
+    return this->private_member_type (slot, env);
 }
 
 // Applicable only to struct, union, and except
 
 const char *
 CORBA_TypeCode::member_name (CORBA::ULong slot,
-                             CORBA::Environment &ACE_TRY_ENV) const
+                             CORBA::Environment &env) const
 {
   if (this->private_state_->tc_member_count_known_
       && this->private_state_->tc_member_name_list_known_)
@@ -366,16 +381,16 @@ CORBA_TypeCode::member_name (CORBA::ULong slot,
       if (slot < this->private_state_->tc_member_count_)
         return this->private_state_->tc_member_name_list_[slot];
       else
-        ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+        TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
     }
   else
-    return this->private_member_name (slot, ACE_TRY_ENV);
+    return this->private_member_name (slot, env);
 }
 
 // Return the label of the i-th member.  Applicable only to CORBA::tk_union
 CORBA::Any_ptr
 CORBA_TypeCode::member_label (CORBA::ULong slot,
-                              CORBA::Environment &ACE_TRY_ENV) const
+                              CORBA::Environment &env) const
 {
   if (this->private_state_->tc_member_count_known_
       && this->private_state_->tc_member_label_list_known_)
@@ -383,41 +398,41 @@ CORBA_TypeCode::member_label (CORBA::ULong slot,
       if (slot < this->private_state_->tc_member_count_)
         return this->private_state_->tc_member_label_list_[slot];
       else
-        ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+        TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
     }
   else
-    return this->private_member_label (slot, ACE_TRY_ENV);
+    return this->private_member_label (slot, env);
 }
 
 // only applicable to CORBA::tk_unions
 CORBA::TypeCode_ptr
-CORBA_TypeCode::discriminator_type (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::discriminator_type (CORBA::Environment &env) const
 {
   if (this->kind_ != CORBA::tk_union)
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (CORBA::TypeCode_ptr)0);
+    TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, (CORBA::TypeCode_ptr)0);
 
   if (this->private_state_->tc_discriminator_type_known_)
     return this->private_state_->tc_discriminator_type_;
   else
-    return this->private_discriminator_type (ACE_TRY_ENV);
+    return this->private_discriminator_type (env);
 }
 
 // only applicable to CORBA::tk_unions
 CORBA::Long
-CORBA_TypeCode::default_index (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::default_index (CORBA::Environment &env) const
 {
   if (this->kind_ != CORBA::tk_union)
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+    TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, 0);
 
   if (this->private_state_->tc_default_index_used_known_)
     return this->private_state_->tc_default_index_used_;
   else
-    return this->private_default_index (ACE_TRY_ENV);
+    return this->private_default_index (env);
 }
 
 // returns the length. Applicable only to string, sequence, and arrays
 CORBA::ULong
-CORBA_TypeCode::length (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::length (CORBA::Environment &env) const
 {
   // a switch stmt, unfortunately, doesn't get inlined
   if (this->kind_ == CORBA::tk_sequence
@@ -428,15 +443,15 @@ CORBA_TypeCode::length (CORBA::Environment &ACE_TRY_ENV) const
       if (this->private_state_->tc_length_known_)
         return this->private_state_->tc_length_;
       else
-        return this->private_length (ACE_TRY_ENV);
+        return this->private_length (env);
     }
   else
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+    TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, 0);
 }
 
 // returns the typecode. Applicable only to string, sequence, and arrays
 CORBA::TypeCode_ptr
-CORBA_TypeCode::content_type (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::content_type (CORBA::Environment &env) const
 {
   if (this->kind_ == CORBA::tk_sequence
       || this->kind_ == CORBA::tk_array
@@ -445,23 +460,23 @@ CORBA_TypeCode::content_type (CORBA::Environment &ACE_TRY_ENV) const
       if (this->private_state_->tc_content_type_known_)
         return this->private_state_->tc_content_type_;
       else
-        return this->private_content_type (ACE_TRY_ENV);
+        return this->private_content_type (env);
     }
   else
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+    TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, 0);
 }
 
 // compute the padded size of the discriminant
 CORBA::ULong
-CORBA_TypeCode::TAO_discrim_pad_size (CORBA::Environment &ACE_TRY_ENV)
+CORBA_TypeCode::TAO_discrim_pad_size (CORBA::Environment &env)
 {
   if (this->kind_ != CORBA::tk_union)
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+    TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, 0);
 
   if (this->private_state_->tc_discrim_pad_size_known_)
     return this->private_state_->tc_discrim_pad_size_;
   else
-    return this->private_discrim_pad_size (ACE_TRY_ENV);
+    return this->private_discrim_pad_size (env);
 }
 
 // skip a typecode encoding in a given CDR stream
@@ -685,7 +700,7 @@ TC_Private_State::~TC_Private_State (void)
 // equivalence, else resort simply to structural equivalence.
 CORBA::Boolean
 CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
-                               CORBA::Environment &ACE_TRY_ENV) const
+                               CORBA::Environment &env) const
 {
   // We come in here only if the typecode kinds of both are same
   // Handle each complex typecode separately.
@@ -713,25 +728,25 @@ CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
       // the kind_ field
       return 1;
     case CORBA::tk_objref:
-      return this->private_equal_objref (tc, ACE_TRY_ENV);
+      return this->private_equal_objref (tc, env);
     case CORBA::tk_struct:
-      return this->private_equal_struct (tc, ACE_TRY_ENV);
+      return this->private_equal_struct (tc, env);
     case CORBA::tk_union:
-      return this->private_equal_union (tc, ACE_TRY_ENV);
+      return this->private_equal_union (tc, env);
     case CORBA::tk_enum:
-      return this->private_equal_enum (tc, ACE_TRY_ENV);
+      return this->private_equal_enum (tc, env);
     case CORBA::tk_string:
-      return this->private_equal_string (tc, ACE_TRY_ENV);
+      return this->private_equal_string (tc, env);
     case CORBA::tk_wstring:
-      return this->private_equal_wstring (tc, ACE_TRY_ENV);
+      return this->private_equal_wstring (tc, env);
     case CORBA::tk_sequence:
-      return this->private_equal_sequence (tc, ACE_TRY_ENV);
+      return this->private_equal_sequence (tc, env);
     case CORBA::tk_array:
-      return this->private_equal_array (tc, ACE_TRY_ENV);
+      return this->private_equal_array (tc, env);
     case CORBA::tk_alias:
-      return this->private_equal_alias (tc, ACE_TRY_ENV);
+      return this->private_equal_alias (tc, env);
     case CORBA::tk_except:
-      return this->private_equal_except (tc, ACE_TRY_ENV);
+      return this->private_equal_except (tc, env);
     case ~0u: // indirection
       {
         // indirection offset must be same
@@ -745,25 +760,25 @@ CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_objref (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &ACE_TRY_ENV) const
+                                      CORBA::Environment &env) const
 {
-  //  ACE_TRY_ENV.clear ();
+  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);
-  ACE_CHECK_RETURN (0);
+  const char *my_id = this->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_id = tc->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   if (!ACE_OS::strcmp (my_id, tc_id))
     {
       // same repository IDs. Now check their names
-      const char *myname = this->name (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      const char *myname = this->name (env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      const char *tcname = tc->name (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      const char *tcname = tc->name (env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
       if ((ACE_OS::strlen (myname) > 1) &&
           (ACE_OS::strlen (tcname) > 1))
@@ -781,23 +796,23 @@ CORBA_TypeCode::private_equal_objref (CORBA::TypeCode_ptr tc,
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &ACE_TRY_ENV) const
+                                      CORBA::Environment &env) const
 {
-  //  ACE_TRY_ENV.clear ();
+  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);
-  ACE_CHECK_RETURN (0);
+  const char *my_id = this->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_id = tc->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *my_name = this->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_name = tc->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   // compare repoIDs if they exist
   if (ACE_OS::strlen (my_id) > 1
@@ -812,11 +827,11 @@ CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
     return 0;
 
   // Check if the member count is same.
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong my_count = this->member_count (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong tc_count = tc->member_count (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   if (my_count != tc_count)
     return 0; // number of members don't match
@@ -824,12 +839,12 @@ CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
   for (CORBA::ULong i=0; i < my_count; i++)
     {
       const char *my_member_name =
-        this->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+        this->member_name (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
       const char *tc_member_name =
-        tc->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+        tc->member_name (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
       if (ACE_OS::strlen (my_member_name) > 1
           && ACE_OS::strlen (tc_member_name) > 1
@@ -837,15 +852,15 @@ CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
         return 0;
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
       CORBA::Boolean flag =
-        my_member_tc->equal (tc_member_tc, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+        my_member_tc->equal (tc_member_tc, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
       if (!flag)
         return 0;
     }
@@ -855,23 +870,23 @@ CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+                                     CORBA::Environment &env) const
 {
-  //  ACE_TRY_ENV.clear ();
+  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);
-  ACE_CHECK_RETURN (0);
+  const char *my_id = this->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_id = tc->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *my_name = this->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_name = tc->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   // compare repoIDs if they exist
   if (ACE_OS::strlen (my_id) > 1
@@ -886,33 +901,33 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
     return 0;
 
   // check if the discriminant type is same
-  CORBA::TypeCode_ptr my_discrim = this->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_ptr my_discrim = this->discriminator_type (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::TypeCode_ptr tc_discrim = tc->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_ptr tc_discrim = tc->discriminator_type (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  int status = my_discrim->equal (tc_discrim, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  int status = my_discrim->equal (tc_discrim, env);
+  TAO_CHECK_ENV_RETURN (env, 0);
   if (!status)
     return 0;
 
   // check the default used
-  CORBA::Long my_default = this->default_index (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::Long my_default = this->default_index (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::Long tc_default = tc->default_index (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::Long tc_default = tc->default_index (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   if (my_default != tc_default)
     return 0;
 
   // check if the member count is same
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong my_count = this->member_count (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong tc_count = tc->member_count (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   if (my_count != tc_count)
     return 0; // number of members don't match
@@ -922,11 +937,11 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
       // First check if labels are same.
 
       // check if member names are same
-      const char *my_member_name = this->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      const char *my_member_name = this->member_name (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      const char *tc_member_name = tc->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      const char *tc_member_name = tc->member_name (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
       if (ACE_OS::strlen (my_member_name) > 1 && ACE_OS::strlen
           (tc_member_name) > 1)
@@ -935,14 +950,14 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
           return 0;
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      CORBA::Boolean flag = my_member_tc->equal (tc_member_tc, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      CORBA::Boolean flag = my_member_tc->equal (tc_member_tc, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
       if (!flag)
         return 0;
     }
@@ -952,23 +967,23 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
-                                    CORBA::Environment &ACE_TRY_ENV) const
+                                    CORBA::Environment &env) const
 {
-  //  ACE_TRY_ENV.clear ();
+  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);
-  ACE_CHECK_RETURN (0);
+  const char *my_id = this->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_id = tc->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *my_name = this->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_name = tc->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   // compare repoIDs if they exist
   if (ACE_OS::strlen (my_id) > 1 && ACE_OS::strlen (tc_id) > 1)
@@ -981,11 +996,11 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
       return 0;
 
   // check if the member count is same
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong my_count = this->member_count (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong tc_count = tc->member_count (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   if (my_count != tc_count)
     return 0; // number of members don't match
@@ -993,11 +1008,11 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
   for (CORBA::ULong i=0; i < my_count; i++)
     {
       // now check if the member names are same
-      const char *my_member_name = this->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      const char *my_member_name = this->member_name (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      const char *tc_member_name = tc->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      const char *tc_member_name = tc->member_name (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
       if (ACE_OS::strlen (my_member_name) > 1 && ACE_OS::strlen
           (tc_member_name) > 1)
@@ -1011,86 +1026,86 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_string (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &ACE_TRY_ENV) const
+                                      CORBA::Environment &env) const
 {
   // compare the lengths
-  CORBA::ULong my_len = this->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong my_len = this->length (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::ULong tc_len = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong tc_len = tc->length (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   return (my_len == tc_len);
 }
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_wstring (CORBA::TypeCode_ptr tc,
-                                       CORBA::Environment &ACE_TRY_ENV) const
+                                       CORBA::Environment &env) const
 {
   // compare the lengths
-  CORBA::ULong my_len = this->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong my_len = this->length (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::ULong tc_len = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong tc_len = tc->length (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   return (my_len == tc_len);
 }
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_sequence (CORBA::TypeCode_ptr tc,
-                                        CORBA::Environment &ACE_TRY_ENV) const
+                                        CORBA::Environment &env) const
 {
   // this involves comparing the typecodes of the element type as well as the
   // bounds
-  CORBA::TypeCode_ptr my_elem = this->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_ptr my_elem = this->content_type (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::TypeCode_ptr tc_elem = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_ptr tc_elem = tc->content_type (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  int status = my_elem->equal (tc_elem, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  int status = my_elem->equal (tc_elem, env);
+  TAO_CHECK_ENV_RETURN (env, 0);
   if (!status)
     return 0;
 
   // now check if bounds are same
-  CORBA::ULong my_len = this->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong my_len = this->length (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::ULong tc_len = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong tc_len = tc->length (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   return (my_len == tc_len);
 }
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_array (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+                                     CORBA::Environment &env) const
 {
   // exactly like sequence
-  return this->private_equal_sequence (tc, ACE_TRY_ENV);
+  return this->private_equal_sequence (tc, env);
 }
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+                                     CORBA::Environment &env) const
 {
-  //  ACE_TRY_ENV.clear ();
+  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);
-  ACE_CHECK_RETURN (0);
+  const char *my_id = this->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_id = tc->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *my_name = this->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_name = tc->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   // compare repoIDs if they exist
   if (ACE_OS::strlen (my_id) > 1 && ACE_OS::strlen (tc_id) > 1)
@@ -1103,37 +1118,37 @@ CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
       return 0;
 
   // now compare element typecodes
-  CORBA::TypeCode_ptr my_elem = this->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_ptr my_elem = this->content_type (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::TypeCode_ptr tc_elem = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::TypeCode_ptr tc_elem = tc->content_type (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  return my_elem->equal (tc_elem, ACE_TRY_ENV);
+  return my_elem->equal (tc_elem, env);
 }
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
-                                      CORBA::Environment &ACE_TRY_ENV) const
+                                      CORBA::Environment &env) const
 {
   // exactly similar to structs, except that the repository ID is mandatory
-  //  ACE_TRY_ENV.clear ();
+  env.clear ();
 
-  const char *my_id = this->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *my_id = this->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_id = tc->id (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   if (ACE_OS::strcmp (my_id, tc_id))
     return 0; // failed
 
   // now compare names. They may be optional
-  const char *my_name = this->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *my_name = this->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  const char *tc_name = tc->name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  const char *tc_name = tc->name (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   // compare names if they exist
   if (ACE_OS::strlen (my_name) > 1 && ACE_OS::strlen (tc_name) > 1)
@@ -1141,22 +1156,22 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
       return 0;
 
   // check if the member count is same
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong my_count = this->member_count (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  CORBA::ULong tc_count = tc->member_count (env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   if (my_count != tc_count)
     return 0; // number of members don't match
 
   for (CORBA::ULong i=0; i < my_count; i++)
     {
-      const char *my_member_name = this->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      const char *my_member_name = this->member_name (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      const char *tc_member_name = tc->member_name (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      const char *tc_member_name = tc->member_name (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
       if (ACE_OS::strlen (my_member_name) > 1 && ACE_OS::strlen
           (tc_member_name) > 1)
@@ -1165,14 +1180,14 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
           return 0;
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      CORBA::TypeCode_ptr my_member_tc = this->member_type (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      CORBA::TypeCode_ptr tc_member_tc = tc->member_type (i, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      CORBA::Boolean flag = my_member_tc->equal (tc_member_tc, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      CORBA::Boolean flag = my_member_tc->equal (tc_member_tc, env);
+      TAO_CHECK_ENV_RETURN (env, 0);
       if (!flag)
         return 0;
     }
@@ -1187,9 +1202,9 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
 // Valid only for objref, struct, union, enum, alias, and except. Raises
 // BadKind exception for the rest of the cases.
 const char *
-CORBA_TypeCode::private_id (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_id (CORBA::Environment &env) const
 {
-  //  ACE_TRY_ENV.clear ();
+  env.clear ();
 
   switch (this->kind_)
     {
@@ -1221,15 +1236,15 @@ CORBA_TypeCode::private_id (CORBA::Environment &ACE_TRY_ENV) const
       }
     // No other typecodes ever have type IDs
     default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+      TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, 0);
     }
 }
 
 // return the name. The string is owned by the typecode
 const char *
-CORBA_TypeCode::private_name (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_name (CORBA::Environment &env) const
 {
-  //  ACE_TRY_ENV.clear ();
+  env.clear ();
 
   switch (this->kind_)
     {
@@ -1267,11 +1282,11 @@ CORBA_TypeCode::private_name (CORBA::Environment &ACE_TRY_ENV) const
             return this->private_state_->tc_name_;
           }
         else
-          ACE_THROW_RETURN (CORBA::INTERNAL (), (CORBA::String)0);
+          TAO_THROW_ENV_RETURN (CORBA::INTERNAL (), env, (CORBA::String)0);
       }
     // No other typecodes ever have type IDs.
     default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (CORBA::String)0);
+      TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, (CORBA::String)0);
     }
   ACE_NOTREACHED (return 0);
 }
@@ -1282,9 +1297,9 @@ CORBA_TypeCode::private_name (CORBA::Environment &ACE_TRY_ENV) const
 // For the rest of the cases, raises the BadKind exception.
 
 CORBA::ULong
-CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_member_count (CORBA::Environment &env) const
 {
-  //  ACE_TRY_ENV.clear ();
+  env.clear ();
 
   switch (kind_)
     {
@@ -1311,7 +1326,7 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const
         if (!stream.skip_string ()          // ID
             || !stream.skip_string ()       // struct name
             || !stream.read_ulong (members))
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
         this->private_state_->tc_member_count_known_ = 1;
         this->private_state_->tc_member_count_ = members;
@@ -1337,14 +1352,14 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const
             || !skip_typecode (stream)          // discriminant TC
             || !stream.read_ulong (members)      // default used
             || !stream.read_ulong (members))     // real member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
         this->private_state_->tc_member_count_known_ = 1;
         this->private_state_->tc_member_count_ = members;
         return this->private_state_->tc_member_count_;
       }
     default:
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
     }
   ACE_NOTREACHED (return 0);
 }
@@ -1359,7 +1374,7 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const
 
 CORBA::TypeCode_ptr
 CORBA_TypeCode::private_member_type (CORBA::ULong slot,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+                                     CORBA::Environment &env) const
 {
   CORBA::ULong temp, mcount;
 
@@ -1374,10 +1389,10 @@ 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);
+      mcount = this->member_count (env);                // clears 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);
+      // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (CORBA::TypeCode_ptr)0);
+      TAO_CHECK_ENV_RETURN (env, (CORBA::TypeCode_ptr)0);
 
       {
         // Double checked locking...
@@ -1387,7 +1402,7 @@ 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 ());
+            TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, CORBA::TypeCode::_nil ());
 
         // the first time in. Precompute and store types of all members
 
@@ -1396,13 +1411,13 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
         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);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (CORBA::TypeCode_ptr)0);
 
         // skip the id, name, and member_count part
         if (!stream.skip_string ()        // type ID, hidden
             || !stream.skip_string ()     // typedef name
             || !stream.read_ulong (temp))  // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (CORBA::TypeCode_ptr)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (CORBA::TypeCode_ptr)0);
 
         // compute the typecodes for all the members and
         // return the required one.
@@ -1410,7 +1425,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
           // the ith entry will have the typecode of the ith guy
           {
             if (!stream.skip_string ())  // skip the name
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
             CORBA::TypeCode::traverse_status status =
               stream.decode (CORBA::_tc_TypeCode,
                              // the typecode will be
@@ -1427,11 +1442,11 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
                              // is the case where the 3rd
                              // parameter is used in a
                              // decode method
-                             ACE_TRY_ENV);
-            ACE_CHECK_RETURN (0);
+                             env);
+            TAO_CHECK_ENV_RETURN (env, 0);
 
             if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
           }
 
         this->private_state_->tc_member_type_list_known_ = 1;
@@ -1439,15 +1454,15 @@ 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_ptr)0);
+          TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (CORBA::TypeCode_ptr)0);
       }
       ACE_NOTREACHED (break;)
 
     case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);                // clears ACE_TRY_ENV
+      mcount = this->member_count (env);                // clears 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);
+      // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (CORBA::TypeCode_ptr)0);
+      TAO_CHECK_ENV_RETURN (env, (CORBA::TypeCode_ptr)0);
 
       {
         // Double checked locking...
@@ -1457,66 +1472,66 @@ 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 ());
+            TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 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);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (CORBA::TypeCode_ptr)0);
 
       // skip the id, name, and discrimant type part
         if (!stream.skip_string ()        // type ID, hidden
             || !stream.skip_string ()     // typedef name
             || !skip_typecode (stream))   // skip typecode for discriminant
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (CORBA::TypeCode_ptr)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (CORBA::TypeCode_ptr)0);
         else if (!stream.read_ulong (temp)     // default used
                  || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
         // Always big enough because labels can only be of a
         // few different types of which "long" has the
         // largest size.
         CORBA::Long scratch;
 
       // get the typecode for the discriminator
-        tc = this->discriminator_type (ACE_TRY_ENV);
+        tc = this->discriminator_type (env);
         // compute the typecodes for all the members and return the
         // required one
-        ACE_CHECK_RETURN (0);
+        TAO_CHECK_ENV_RETURN (env, 0);
 
         for (CORBA::ULong i = 0; i < mcount; i++)
           // the ith entry will have the typecode of the ith guy
           {
             CORBA::TypeCode::traverse_status status =
-              stream.decode (tc, &scratch, this,  ACE_TRY_ENV);
+              stream.decode (tc, &scratch, this,  env);
             // member label
-            ACE_CHECK_RETURN (0);
+            TAO_CHECK_ENV_RETURN (env, 0);
 
             if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
                 || !stream.skip_string ())  // skip the name
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
             status =  stream.decode (CORBA::_tc_TypeCode,  // get the typecode
                                      &private_state_->tc_member_type_list_[i],
                                      this,
-                                     ACE_TRY_ENV);
-            ACE_CHECK_RETURN (0);
+                                     env);
+            TAO_CHECK_ENV_RETURN (env, 0);
 
             if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-              ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
           }
         this->private_state_->tc_member_type_list_known_ = 1;
 
         if (slot < mcount)
           return this->private_state_->tc_member_type_list_[slot];
         else
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (CORBA::TypeCode_ptr)0);
+          TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (CORBA::TypeCode_ptr)0);
       }
       ACE_NOTREACHED (break);
 
     default:
       // bad kind
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (CORBA::TypeCode_ptr)0);
+      TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, (CORBA::TypeCode_ptr)0);
     }
 }
 
@@ -1525,7 +1540,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
 // CORBA::tk_except
 const char *
 CORBA_TypeCode::private_member_name (CORBA::ULong slot,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+                                     CORBA::Environment &env) const
 {
   CORBA::ULong temp, mcount;
 
@@ -1539,10 +1554,10 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
   switch (kind_)
     {
     case CORBA::tk_enum:
-      mcount = this->member_count (ACE_TRY_ENV);                // clears ACE_TRY_ENV
+      mcount = this->member_count (env);                // clears env
       // out of bounds
-      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
-      ACE_CHECK_RETURN ((char *)0);
+      // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (char *)0);
+      TAO_CHECK_ENV_RETURN (env, (char *)0);
 
       {
         // Double checked locking...
@@ -1552,7 +1567,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
           if (slot < mcount)
             return this->private_state_->tc_member_name_list_[slot];
           else
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+            TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
 
       // the first time in. Precompute and store names of all members
       // Allocate a list to hold the member names
@@ -1560,36 +1575,36 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
 
         if (this->private_state_->tc_member_name_list_ == 0)
           // no memory for the member_list
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (), (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (char *)0);
 
         // skip the id, name, and member_count part
         if (!stream.skip_string ()     // type ID, hidden
             || !stream.skip_string ()     // enum name
             || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0);
 
       // compute the typecodes for all the members and
       // return the required one.
         for (CORBA::ULong i = 0; i < mcount; i++)
           // now skip this name
           if (!stream.read_string (this->private_state_->tc_member_name_list_ [i]))
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
+            TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0);
 
         this->private_state_->tc_member_name_list_known_ = 1;
 
         if (slot < mcount)
           return this->private_state_->tc_member_name_list_[slot];
         else
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (char *)0);
       }
       ACE_NOTREACHED (break);
 
     case CORBA::tk_except:
     case CORBA::tk_struct:              // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);                // clears ACE_TRY_ENV
+      mcount = this->member_count (env);                // clears env
       // out of bounds
-      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
-      ACE_CHECK_RETURN ((char *)0);
+      // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (char *)0);
+      TAO_CHECK_ENV_RETURN (env, (char *)0);
 
       {
         // Double checked locking...
@@ -1599,7 +1614,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
           if (slot < mcount)
             return this->private_state_->tc_member_name_list_[slot];
           else
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+            TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
 
       // the first time in. Precompute and store names of all members
       // Allocate a list to hold the member names
@@ -1607,35 +1622,35 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
 
         if (this->private_state_->tc_member_name_list_ == 0)
           // no memory for the member_list
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (), (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (char *)0);
 
         // skip the id, name, and member_count part
         if (!stream.skip_string ()     // type ID, hidden
             || !stream.skip_string ()     // struct/except name
             || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0);
 
           // compute the typecodes for all the members and
           // return the required one.
         for (CORBA::ULong i = 0; i < mcount; i++)
           if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])
               || !skip_typecode (stream))
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+            TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
         this->private_state_->tc_member_name_list_known_ = 1;
 
         if (slot < mcount)
           return this->private_state_->tc_member_name_list_[slot];
         else
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (char *)0);
       }
       ACE_NOTREACHED (break;)
 
     case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);                // clears ACE_TRY_ENV
+      mcount = this->member_count (env);                // clears env
       // out of bounds
-      // if (ACE_TRY_ENV.exception ()) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
-      ACE_CHECK_RETURN ((char *)0);
+      // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (char *)0);
+      TAO_CHECK_ENV_RETURN (env, (char *)0);
 
       {
         // Double checked locking...
@@ -1645,7 +1660,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
           if (slot < mcount)
             return this->private_state_->tc_member_name_list_[slot];
           else
-            ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
+            TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
 
       // the first time in. Precompute and store names of all members
       // Allocate a list to hold the member names
@@ -1653,16 +1668,16 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
 
         if (this->private_state_->tc_member_name_list_ == 0)
           // no memory for the member_list
-          ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, 0);
 
         // skip the id, name, and discrimant type part
         if (!stream.skip_string ()        // type ID, hidden
             || !stream.skip_string ()     // typedef name
             || !skip_typecode (stream))   // skip typecode for discriminant
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0);
         else if (!stream.read_ulong (temp)     // default used
                  || !stream.read_ulong (temp)) // member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
         else
           {
             CORBA::Long scratch; // always big enough because labels can
@@ -1670,25 +1685,25 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
             // which "long" has the largest size
 
             // get the typecode for the discriminator
-            tc = this->discriminator_type (ACE_TRY_ENV);
+            tc = this->discriminator_type (env);
             // compute the name for all the members and return the
             // required one
-            ACE_CHECK_RETURN (0);
+            TAO_CHECK_ENV_RETURN (env, 0);
 
             for (CORBA::ULong i = 0; i < mcount; i++)
               {
                 // the ith entry will have the name of the ith member
                 CORBA::TypeCode::traverse_status status =
-                  stream.decode (tc, &scratch, this,  ACE_TRY_ENV); // member label
-                ACE_CHECK_RETURN (0);
+                  stream.decode (tc, &scratch, this,  env); // member label
+                TAO_CHECK_ENV_RETURN (env, 0);
 
                 if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-                  ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+                  TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
                 // skip typecode for member
                 if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])
                     || (!skip_typecode (stream))) // skip typecode
-                  ACE_THROW_RETURN ( CORBA::BAD_TYPECODE (), 0);
+                  TAO_THROW_ENV_RETURN ( CORBA::BAD_TYPECODE (), env, 0);
               }
 
             this->private_state_->tc_member_name_list_known_ = 1;
@@ -1696,14 +1711,14 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
             if (slot < mcount)
               return this->private_state_->tc_member_name_list_[slot];
             else
-              ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), (char *)0);
+              TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, (char *)0);
           }
       }
       ACE_NOTREACHED (break;)
 
     default:
       // bad kind
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (char *)0);
+      TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, (char *)0);
     }
   ACE_NOTREACHED (return (char *)0;)
 }
@@ -1830,7 +1845,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
 }
 
 CORBA::TypeCode_ptr
-CORBA_TypeCode::private_discriminator_type (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_discriminator_type (CORBA::Environment &env) const
 {
   // Double checked locking...
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
@@ -1847,15 +1862,15 @@ CORBA_TypeCode::private_discriminator_type (CORBA::Environment &ACE_TRY_ENV) con
       || !stream.skip_string () // typedef name
       || stream.decode (CORBA::_tc_TypeCode,
                         &this->private_state_->tc_discriminator_type_, this,
-                        ACE_TRY_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+                        env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
+    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
   this->private_state_->tc_discriminator_type_known_ = 1;
   return this->private_state_->tc_discriminator_type_;
 }
 
 CORBA::Long
-CORBA_TypeCode::private_default_index (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_default_index (CORBA::Environment &env) const
 {
   // Double checked locking...
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
@@ -1872,14 +1887,14 @@ CORBA_TypeCode::private_default_index (CORBA::Environment &ACE_TRY_ENV) const
       || !stream.skip_string ()         // typedef name
       || !skip_typecode (stream)        // skip discriminant
       || !stream.read_long (this->private_state_->tc_default_index_used_))
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
   this->private_state_->tc_default_index_used_known_ = 1;
   return this->private_state_->tc_default_index_used_;
 }
 
 CORBA::Long
-CORBA_TypeCode::private_length (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_length (CORBA::Environment &env) const
 {
   TAO_InputCDR stream (this->buffer_+4, this->length_-4,
                        this->byte_order_);
@@ -1897,7 +1912,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &ACE_TRY_ENV) const
         // skip the typecode of the element and get the bounds
         if (!skip_typecode (stream) // skip typecode
             || !stream.read_ulong (this->private_state_->tc_length_))
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
         else
           {
             this->private_state_->tc_length_known_ = 1;
@@ -1921,18 +1936,18 @@ CORBA_TypeCode::private_length (CORBA::Environment &ACE_TRY_ENV) const
             return this->private_state_->tc_length_;
           }
         else
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
       }
       ACE_NOTREACHED (break);
 
     default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+      TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, 0);
     }
   ACE_NOTREACHED (return 0);
 }
 
 CORBA::TypeCode_ptr
-CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_content_type (CORBA::Environment &env) const
 {
   TAO_InputCDR stream (this->buffer_+4, this->length_-4,
                        this->byte_order_);
@@ -1952,11 +1967,11 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const
         // retrieve the content type
         status = stream.decode (CORBA::_tc_TypeCode,
                            &this->private_state_->tc_content_type_,
-                           this,  ACE_TRY_ENV);
-        ACE_CHECK_RETURN (0);
+                           this,  env);
+        TAO_CHECK_ENV_RETURN (env, 0);
 
         if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) // element type
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
         else
           {
             this->private_state_->tc_content_type_known_ = 1;
@@ -1975,15 +1990,15 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const
 
         if (!stream.skip_string ()  // typeID
             || !stream.skip_string ()) // name
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
 
         status = stream.decode (CORBA::_tc_TypeCode,
                                 &this->private_state_->tc_content_type_, this,
-                                ACE_TRY_ENV);
-        ACE_CHECK_RETURN (0);
+                                env);
+        TAO_CHECK_ENV_RETURN (env, 0);
 
         if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
         else
           {
             this->private_state_->tc_content_type_known_ = 1;
@@ -1993,13 +2008,13 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const
       /*NOTREACHED*/
 
     default:
-      ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+      TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, 0);
     }
   ACE_NOTREACHED (return 0);
 }
 
 CORBA::ULong
-CORBA_TypeCode::private_discrim_pad_size (CORBA::Environment &ACE_TRY_ENV)
+CORBA_TypeCode::private_discrim_pad_size (CORBA::Environment &env)
 {
   // Double checked locking...
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
@@ -2016,8 +2031,8 @@ CORBA_TypeCode::private_discrim_pad_size (CORBA::Environment &ACE_TRY_ENV)
  (void) TAO_CDR_Interpreter::calc_key_union_attributes (&stream,
                                                          overall_align,
                                                          discrim_size,
-                                                         ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
+                                                         env);
+ TAO_CHECK_ENV_RETURN (env, 0);
 
  this->private_state_->tc_discrim_pad_size_known_ = 1;
  this->private_state_->tc_discrim_pad_size_ = discrim_size;
@@ -2034,9 +2049,9 @@ CORBA_TypeCode::private_discrim_pad_size (CORBA::Environment &ACE_TRY_ENV)
 // provides.
 
 CORBA::ULong
-CORBA_TypeCode::param_count (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::param_count (CORBA::Environment &env) const
 {
-  //  ACE_TRY_ENV.clear ();
+  env.clear ();
 
   switch (this->kind_)
     {
@@ -2067,7 +2082,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &ACE_TRY_ENV) const
         if (!stream.skip_string ()                  // ID
             || !stream.skip_string ()       // struct name
             || !stream.read_ulong (members))
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
         return 3 + 2 * members;
       }
@@ -2083,7 +2098,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &ACE_TRY_ENV) const
         if (!stream.skip_string ()                      // ID
             || !stream.skip_string ()           // typedef name
             || !stream.read_ulong (members))
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
         return 3 + members;
       }
@@ -2101,7 +2116,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &ACE_TRY_ENV) const
             || !skip_typecode (stream)          // discriminant TC
             || !stream.read_ulong (members)      // default used
             || !stream.read_ulong (members))     // real member count
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
         return 5 + 3 * members;
       }
@@ -2121,12 +2136,12 @@ CORBA_TypeCode::parameter (const CORBA::Long slot,
 // this typecode ... typically used to allocate memory.
 
 size_t
-CORBA::TypeCode::private_size (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode::private_size (CORBA::Environment &env)
 {
   if (kind_ >= CORBA::TC_KIND_COUNT)
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
-  //  ACE_TRY_ENV.clear ();
+  env.clear ();
 
   // Double checked locking...
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
@@ -2148,7 +2163,7 @@ CORBA::TypeCode::private_size (CORBA::Environment &ACE_TRY_ENV)
 
   private_state_->tc_size_known_ = 1;
   private_state_->tc_size_ =
-    TAO_CDR_Interpreter::table_[kind_].calc_ (&stream, alignment, ACE_TRY_ENV);
+    TAO_CDR_Interpreter::table_[kind_].calc_ (&stream, alignment, env);
   return private_state_->tc_size_;
 }
 
@@ -2157,12 +2172,12 @@ CORBA::TypeCode::private_size (CORBA::Environment &ACE_TRY_ENV)
 // completeness.
 
 size_t
-CORBA::TypeCode::private_alignment (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode::private_alignment (CORBA::Environment &env)
 {
-  //  ACE_TRY_ENV.clear ();
+  env.clear ();
 
   if (kind_ >= CORBA::TC_KIND_COUNT)
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
 
   // Double checked locking...
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
@@ -2184,8 +2199,8 @@ CORBA::TypeCode::private_alignment (CORBA::Environment &ACE_TRY_ENV)
 
   (void) TAO_CDR_Interpreter::table_[kind_].calc_ (&stream,
                                                     alignment,
-                                                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+                                                    env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   private_state_->tc_alignment_known_ = 1;
   private_state_->tc_alignment_ = alignment;
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
index a9bc37c5203..fb1b54f9778 100644
--- a/TAO/tao/Typecode.i
+++ b/TAO/tao/Typecode.i
@@ -43,36 +43,36 @@ CORBA_TypeCode::kind (CORBA::Environment &) const
 // Returns true if the two typecodes are identical
 ACE_INLINE CORBA::Boolean
 CORBA_TypeCode::equal (const CORBA::TypeCode_ptr tc,
-                       CORBA::Environment &ACE_TRY_ENV) const
+                       CORBA::Environment &env) const
 {
-  if (this->kind_ != tc->kind (ACE_TRY_ENV))
+  if (this->kind_ != tc->kind (env))
     // simple case
     return 0;
   else
     // typecode kinds are same
-    return this->private_equal (tc, ACE_TRY_ENV);
+    return this->private_equal (tc, env);
 }
 
 // returns the Repository ID
 ACE_INLINE const char *
-CORBA_TypeCode::id (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::id (CORBA::Environment &env) const
 {
   // if already precomputed
   if (this->private_state_->tc_id_known_)
     return this->private_state_->tc_id_;
   else
-    return this->private_id (ACE_TRY_ENV);
+    return this->private_id (env);
 }
 
 // returns the string name
 ACE_INLINE const char *
-CORBA_TypeCode::name (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::name (CORBA::Environment &env) const
 {
   // if already precomputed
   if (this->private_state_->tc_name_known_)
     return this->private_state_->tc_name_;
   else
-    return this->private_name (ACE_TRY_ENV);
+    return this->private_name (env);
 }
 
 // Return the number of members defined by this typecode
@@ -81,49 +81,33 @@ CORBA_TypeCode::name (CORBA::Environment &ACE_TRY_ENV) const
 // For the rest of the cases, raises the BadKind exception.
 
 ACE_INLINE CORBA::ULong
-CORBA_TypeCode::member_count (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::member_count (CORBA::Environment &env) const
 {
   // if already precomputed
   if (this->private_state_->tc_member_count_known_)
     return this->private_state_->tc_member_count_;
   else
-    return this->private_member_count (ACE_TRY_ENV);
+    return this->private_member_count (env);
 }
 
 // calculate size of the typecode
 ACE_INLINE size_t
-CORBA_TypeCode::size (CORBA::Environment &ACE_TRY_ENV)
+CORBA_TypeCode::size (CORBA::Environment &env)
 {
   if (this->private_state_->tc_size_known_)
     return this->private_state_->tc_size_;
   else
-    return this->private_size (ACE_TRY_ENV);
+    return this->private_size (env);
 }
 
 // calculate alignment requirements of the typecode
 ACE_INLINE size_t
-CORBA_TypeCode::alignment (CORBA::Environment &ACE_TRY_ENV)
+CORBA_TypeCode::alignment (CORBA::Environment &env)
 {
   if (this->private_state_->tc_alignment_known_)
     return this->private_state_->tc_alignment_;
   else
-    return this->private_alignment (ACE_TRY_ENV);
-}
-
-// ************************************************************
-// These are in CORBA namespace
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::TypeCode_ptr obj)
-{
-  return obj == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::TypeCode_ptr obj)
-{
-  if (obj)
-    obj->_decr_refcnt ();
+    return this->private_alignment (env);
 }
 
 // ****************************************************************
diff --git a/TAO/tao/UIOP_Acceptor.cpp b/TAO/tao/UIOP_Acceptor.cpp
index bdb3e5a24d1..27607d8d2c4 100644
--- a/TAO/tao/UIOP_Acceptor.cpp
+++ b/TAO/tao/UIOP_Acceptor.cpp
@@ -26,7 +26,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/GIOP.h"
-#include "tao/debug.h"
 
 ACE_RCSID(tao, UIOP_Acceptor, "$Id$")
 
@@ -34,9 +33,7 @@ ACE_RCSID(tao, UIOP_Acceptor, "$Id$")
 
 TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
   : TAO_Acceptor (TAO_IOP_TAG_UNIX_IOP),
-    base_acceptor_ (),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0)
+    base_acceptor_ ()
 {
 }
 
@@ -59,25 +56,12 @@ TAO_UIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
 
   TAO_UIOP_Profile *pfile;
   ACE_NEW_RETURN (pfile,
-                  TAO_UIOP_Profile (addr,
-                                    object_key,
-                                    this->version_,
-                                    this->orb_core_),
+                  TAO_UIOP_Profile (addr, object_key),
                   -1);
 
   if (mprofile.give_profile (pfile) == -1)
     return -1;
 
-  if (this->orb_core_->orb_params ()->std_profile_components () == 0)
-    return 0;
-
-  pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-  CONV_FRAME::CodeSetComponentInfo code_set_info;
-  code_set_info.ForCharData.native_code_set  = TAO_DEFAULT_CHAR_CODESET_ID;
-  code_set_info.ForWcharData.native_code_set = TAO_DEFAULT_WCHAR_CODESET_ID;
-  pfile->tagged_components ().set_code_sets (code_set_info);
-
   return 0;
 }
 
@@ -87,7 +71,9 @@ TAO_UIOP_Acceptor::is_collocated (const TAO_Profile* pfile)
   const TAO_UIOP_Profile *profile =
     ACE_dynamic_cast(const TAO_UIOP_Profile*, pfile);
 
-  // for UNIX Files this is relatively cheap
+  // @@ We should probably cache this value, but then again some
+  //    acceptors have multiple addresses.
+  // @@ Fred: any ideas on how to optimize that?
   ACE_UNIX_Addr address;
   if (this->base_acceptor_.acceptor ().get_local_addr (address) == -1)
     return 0;
@@ -116,13 +102,8 @@ TAO_UIOP_Acceptor::close (void)
 
 int
 TAO_UIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                         int major,
-                         int minor,
                          ACE_CString &address)
 {
-  if (major >= 0 && minor >= 0)
-    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);
@@ -145,28 +126,19 @@ int
 TAO_UIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
                            const ACE_UNIX_Addr& addr)
 {
-  this->orb_core_ = orb_core;
-
   if (this->base_acceptor_.open (orb_core, addr) != 0)
     return -1;
 
   // @@ If Profile creation is slow we may need to cache the
   //    rendezvous point here
 
-  if (TAO_debug_level > 5)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nTAO (%P|%t) UIOP_Acceptor::open_i - "
-                  "listening on: <%s>\n",
-                  addr.get_path_name ()));
-    }
-
   return 0;
 }
 
 CORBA::ULong
 TAO_UIOP_Acceptor::endpoint_count (void)
 {
+  // @@ for now just assume one!
   return 1;
 }
 
diff --git a/TAO/tao/UIOP_Acceptor.h b/TAO/tao/UIOP_Acceptor.h
index 4b4a19da538..3c74cd97be2 100644
--- a/TAO/tao/UIOP_Acceptor.h
+++ b/TAO/tao/UIOP_Acceptor.h
@@ -46,10 +46,7 @@ public:
   TAO_UIOP_Acceptor (void);
   // Create Acceptor object using addr.
 
-  int open (TAO_ORB_Core *orb_core,
-            int version_major,
-            int version_minor,
-            ACE_CString &address);
+  int open (TAO_ORB_Core *orb_core, ACE_CString &address);
   // initialize acceptor for this address.
 
   virtual int close (void);
@@ -75,18 +72,12 @@ public:
   typedef TAO_Acceptor_Impl<TAO_UIOP_Server_Connection_Handler,ACE_LSOCK_ACCEPTOR> TAO_UIOP_BASE_ACCEPTOR;
 
 private:
-  int open_i (TAO_ORB_Core *orb_core, const ACE_UNIX_Addr& addr);
+  int open_i (TAO_ORB_Core* orb_core, const ACE_UNIX_Addr& addr);
   // Implement the common part of the open*() methods
 
 private:
   TAO_UIOP_BASE_ACCEPTOR base_acceptor_;
   // the concrete acceptor, as a pointer to its base class.
-
-  TAO_GIOP_Version version_;
-  // The GIOP version for this endpoint
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
 };
 
 # endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
index c4015059287..70b63f951ca 100644
--- a/TAO/tao/UIOP_Connect.cpp
+++ b/TAO/tao/UIOP_Connect.cpp
@@ -17,7 +17,7 @@
 
 ACE_RCSID(tao, UIOP_Connect, "$Id$")
 
-TAO_UIOP_Handler_Base::TAO_UIOP_Handler_Base (TAO_ORB_Core *orb_core)
+  TAO_UIOP_Handler_Base::TAO_UIOP_Handler_Base (TAO_ORB_Core *orb_core)
     : TAO_UIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0)
 {
 }
@@ -29,10 +29,13 @@ TAO_UIOP_Handler_Base::TAO_UIOP_Handler_Base (ACE_Thread_Manager *t)
 
 // ****************************************************************
 
+// @@ For pluggable protocols, added a reference to
+//    the corresponding transport obj.
 TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_UIOP_Handler_Base (t),
     orb_core_ (0),
-    tss_resources_ (0)
+    tss_resources_ (0),
+    input_ (ACE_CDR::DEFAULT_BUFSIZE)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -47,7 +50,10 @@ TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (ACE_Thre
 TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core)
   : TAO_UIOP_Handler_Base (orb_core),
     orb_core_ (orb_core),
-    tss_resources_ (orb_core->get_tss_resources ())
+    tss_resources_ (TAO_ORB_CORE_TSS_RESOURCES::instance ()),
+    input_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
+            TAO_ENCAP_BYTE_ORDER,
+            orb_core)
 {
   transport_ = new TAO_UIOP_Server_Transport (this,
                                               this->orb_core_);
@@ -186,12 +192,64 @@ TAO_UIOP_Server_Connection_Handler::svc (void)
   return result;
 }
 
+// Handle processing of the request residing in <input>, setting
+// <response_required> to zero if the request is for a oneway or
+// non-zero if for a two-way and <output> to any necessary response
+// (including errors).  In case of errors, -1 is returned and
+// additional information carried in <TAO_IN_ENV>.
+// The request ID is needed by handle_input. It is passed back
+// as reference.
+
+int
+TAO_UIOP_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
+                                                    TAO_OutputCDR &output,
+                                                    CORBA::Boolean &response_required,
+                                                    CORBA::ULong &request_id,
+                                                    CORBA::Environment &ACE_TRY_ENV)
+{
+  TAO_GIOP::process_server_request (this->transport (),
+                                    this->orb_core_,
+                                    input,
+                                    output,
+                                    response_required,
+                                    request_id,
+                                    ACE_TRY_ENV);
+  return 0;
+}
+
+int
+TAO_UIOP_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
+                                                   TAO_OutputCDR &output,
+                                                   CORBA::Boolean &response_required,
+                                                   CORBA::ULong &request_id,
+                                                   CORBA::Environment &ACE_TRY_ENV)
+{
+  TAO_GIOP::process_server_locate (this->transport (),
+                                   this->orb_core_,
+                                   input,
+                                   output,
+                                   response_required,
+                                   request_id,
+                                   ACE_TRY_ENV);
+  return 0;
+}
+
+void
+TAO_UIOP_Server_Connection_Handler::send_response (TAO_OutputCDR &output)
+{
+  TAO_GIOP::send_message (this->transport_,
+                          output,
+                          this->orb_core_);
+}
+
 int
 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->message_header_,
+                                       this->current_offset_,
+                                       this->input_);
 
   if (result == -1 && TAO_debug_level > 0)
     {
@@ -199,17 +257,17 @@ TAO_UIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
                   "TAO (%P|%t) - %p\n",
                   "UIOP_Server_CH::handle_input, handle_input"));
     }
-  if (result == 0)
-    return 0;
-
-  // ACE_ASSERT (result == 1);
-
-  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;
+  if (result == 1)
+    {
+      TAO_GIOP_MessageHeader header_copy = this->message_header_;
+      this->message_header_.message_size = 0;
+      TAO_GIOP::process_server_message (this->transport (),
+                                        this->orb_core_,
+                                        this->input_,
+                                        header_copy);
+      result = 0;
+    }
+  return result;
 }
 
 // ****************************************************************
diff --git a/TAO/tao/UIOP_Connect.h b/TAO/tao/UIOP_Connect.h
index e4ae0d093d1..8d9367a8aba 100644
--- a/TAO/tao/UIOP_Connect.h
+++ b/TAO/tao/UIOP_Connect.h
@@ -129,12 +129,39 @@ public:
 
   // = Template Methods Called by <handle_input>
 
+  virtual int handle_message (TAO_InputCDR &msg,
+                              TAO_OutputCDR &response,
+                              CORBA::Boolean &response_required,
+                              CORBA::ULong &request_id,
+                              CORBA_Environment &TAO_IN_ENV =
+                                  TAO_default_environment ());
+  // Handle processing of the request residing in <msg>, setting
+  // <response_required> to zero if the request is for a oneway or
+  // non-zero if for a two-way and <response> to any necessary
+  // response (including errors).  In case of errors, -1 is returned
+  // and additional information carried in <env>.
+
   TAO_Transport *transport (void);
 
 protected:
   TAO_UIOP_Server_Transport *transport_;
   // @@ New transport object reference.
 
+  virtual int handle_locate (TAO_InputCDR &msg,
+                             TAO_OutputCDR &response,
+                             CORBA::Boolean &response_required,
+                             CORBA::ULong &request_id,
+                             CORBA_Environment &TAO_IN_ENV =
+                                 TAO_default_environment ());
+  // Handle processing of the location request residing in <msg>,
+  // setting <response_required> to one if no errors are encountered.
+  // The LocateRequestReply is placed into <response>.  In case of
+  // errors, -1 is returned and additional information carried in
+  // <TAO_IN_ENV>.
+
+  virtual void send_response (TAO_OutputCDR &response);
+  // Send <response> to the client on the other end.
+
   // = Event Handler overloads
 
   virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
@@ -150,6 +177,12 @@ protected:
 
   TAO_ORB_Core_TSS_Resources *tss_resources_;
   // Cached tss resources of the ORB that activated this object.
+
+  TAO_GIOP_MessageHeader message_header_;
+  CORBA::ULong current_offset_;
+  TAO_InputCDR input_;
+  // This keep the state of the current message, to enable
+  // non-blocking reads.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp
index 4f39a2ffa65..000d501e8c9 100644
--- a/TAO/tao/UIOP_Connector.cpp
+++ b/TAO/tao/UIOP_Connector.cpp
@@ -61,16 +61,13 @@ typedef ACE_Cached_Connect_Strategy<TAO_UIOP_Client_Connection_Handler,
 
 TAO_UIOP_Connector::TAO_UIOP_Connector (void)
   : TAO_Connector (TAO_IOP_TAG_UNIX_IOP),
-    base_connector_ (),
-    orb_core_ (0)
+    base_connector_ ()
 {
 }
 
 int
 TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
-  this->orb_core_ = orb_core;
-
   TAO_Cached_Connector_Lock *connector_lock = 0;
   ACE_NEW_RETURN (connector_lock,
                   TAO_Cached_Connector_Lock (orb_core),
@@ -133,16 +130,13 @@ TAO_UIOP_Connector::connect (TAO_Profile *profile,
                                      oa) == -1)
     { // Give users a clue to the problem.
       if (TAO_orbdebug)
-        {
-          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__,
-                      __LINE__,
-                      buffer,
-                      "errno"));
-        }
+        ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
+                    "%s failed (%p)\n",
+                    __FILE__,
+                    __LINE__,
+                    profile->addr_to_string (),
+                    "errno"));
+
       return -1;
     }
 
@@ -273,9 +267,7 @@ TAO_Profile*
 TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
 {
   TAO_Profile* pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_UIOP_Profile (this->orb_core_),
-                  0);
+  ACE_NEW_RETURN (pfile, TAO_UIOP_Profile, 0);
 
   int r = pfile->decode (cdr);
   if (r == -1)
@@ -301,9 +293,7 @@ TAO_UIOP_Connector::make_profile (const char *endpoint,
   //    //rendezvous_point|object_key
 
   ACE_NEW_RETURN (profile,
-                  TAO_UIOP_Profile (endpoint,
-                                    this->orb_core_,
-                                    ACE_TRY_ENV),
+                  TAO_UIOP_Profile (endpoint, ACE_TRY_ENV),
                   -1);
 
   return 0;  // Success
diff --git a/TAO/tao/UIOP_Connector.h b/TAO/tao/UIOP_Connector.h
index 2139c729ad0..ac9b7971725 100644
--- a/TAO/tao/UIOP_Connector.h
+++ b/TAO/tao/UIOP_Connector.h
@@ -105,9 +105,6 @@ private:
 
   TAO_UIOP_BASE_CONNECTOR base_connector_;
   // The connector initiating connection requests for UIOP.
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
 };
 
 # endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Factory.cpp b/TAO/tao/UIOP_Factory.cpp
index 9228fd81d31..702bc88452b 100644
--- a/TAO/tao/UIOP_Factory.cpp
+++ b/TAO/tao/UIOP_Factory.cpp
@@ -12,8 +12,6 @@ ACE_RCSID(tao, UIOP_Factory, "$Id$")
 
 
 TAO_UIOP_Protocol_Factory::TAO_UIOP_Protocol_Factory (void)
-  :  major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
 {
 }
 
diff --git a/TAO/tao/UIOP_Factory.h b/TAO/tao/UIOP_Factory.h
index 941f3447106..c1da260a864 100644
--- a/TAO/tao/UIOP_Factory.h
+++ b/TAO/tao/UIOP_Factory.h
@@ -48,12 +48,6 @@ public:
 
   virtual TAO_Connector *make_connector  (void);
   // create a connector
-
-private:
-  int major_;
-  int minor_;
-  // Changing the version number can be used to provide backwards
-  // compatibility with old clients.
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory)
diff --git a/TAO/tao/UIOP_Profile.cpp b/TAO/tao/UIOP_Profile.cpp
index 6c0b5c4b98b..5a690299342 100644
--- a/TAO/tao/UIOP_Profile.cpp
+++ b/TAO/tao/UIOP_Profile.cpp
@@ -18,83 +18,210 @@ ACE_RCSID(tao, UIOP_Profile, "$Id$")
 # include "tao/UIOP_Profile.i"
 #endif /* __ACE_INLINE__ */
 
+
 static const char *prefix_ = "uiop:";
 
 const char TAO_UIOP_Profile::object_key_delimiter = '|';
 
-TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
-                                    const TAO_GIOP_Version &version,
-                                    TAO_ORB_Core *orb_core)
+TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr& addr,
+                                    const char *object_key)
   : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
     rendezvous_point_ (0),
-    version_ (version),
+    body_ (),
+    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
+    object_key_ (),
+    object_addr_ (addr),
+    hint_ (0)
+{
+  this->set (addr);
+  int l = ACE_OS::strlen (object_key);
+  this->object_key_.length (l);
+
+  for (int i = 0; i < l; ++i)
+    this->object_key_[i] = object_key[i];
+
+  this->create_body ();
+}
+
+TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr& addr,
+                                    const TAO_ObjectKey& object_key)
+  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
+    body_ (),
+    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
     object_key_ (object_key),
     object_addr_ (addr),
-    hint_ (0),
-    orb_core_ (orb_core)
+    hint_ (0)
 {
   this->set (addr);
+  this->create_body ();
 }
 
-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_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr& addr,
+                                    const TAO_IOP_Version& version,
+                                    const char *object_key)
   : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
     rendezvous_point_ (0),
+    body_ (),
     version_ (version),
+    object_key_ (),
+    object_addr_ (addr),
+    hint_ (0)
+{
+  this->set (addr);
+  int l = ACE_OS::strlen (object_key);
+  this->object_key_.length (l);
+
+  for (int i = 0; i < l; ++i)
+    this->object_key_[i] = object_key[i];
+
+  this->create_body ();
+}
+
+TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr& addr,
+                                    const TAO_IOP_Version& version,
+                                    const TAO_ObjectKey& object_key)
+  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
+    body_ (),
+    version_ (version),
+    object_key_ (object_key),
+    object_addr_ (addr),
+    hint_ (0)
+{
+  this->set (addr);
+  this->create_body ();
+}
+
+TAO_UIOP_Profile::TAO_UIOP_Profile (const char* rendezvous_point,
+                                    const TAO_ObjectKey& object_key)
+  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
+    body_ (),
+    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
+    object_key_ (object_key),
+    object_addr_ (rendezvous_point),
+    hint_ (0)
+{
+
+  if (rendezvous_point)
+  {
+    ACE_NEW (this->rendezvous_point_,
+             char[ACE_OS::strlen (rendezvous_point) + 1]);
+    ACE_OS::strcpy (this->rendezvous_point_, rendezvous_point);
+  }
+
+  this->create_body ();
+}
+
+TAO_UIOP_Profile::TAO_UIOP_Profile (const char* rendezvous_point,
+                                    const TAO_ObjectKey& object_key,
+                                    const ACE_UNIX_Addr& addr)
+  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
+    body_ (),
+    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
     object_key_ (object_key),
     object_addr_ (addr),
-    hint_ (0),
-    orb_core_ (orb_core)
+    hint_ (0)
 {
+
   if (rendezvous_point)
-    {
-      ACE_NEW (this->rendezvous_point_,
-               char[ACE_OS::strlen (rendezvous_point) + 1]);
-      ACE_OS::strcpy (this->rendezvous_point_, rendezvous_point);
-    }
+  {
+    ACE_NEW (this->rendezvous_point_,
+             char[ACE_OS::strlen (rendezvous_point) + 1]);
+    ACE_OS::strcpy (this->rendezvous_point_, rendezvous_point);
+  }
+
+  this->create_body ();
+}
+
+TAO_UIOP_Profile::TAO_UIOP_Profile (const char* rendezvous_point,
+                                    const TAO_IOP_Version& version,
+                                    const TAO_ObjectKey& object_key)
+  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
+    body_ (),
+    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
+    object_key_ (object_key),
+    object_addr_ (rendezvous_point),
+    hint_ (0)
+{
+  ACE_UNUSED_ARG (version);
+
+  ACE_NEW (this->rendezvous_point_,
+           char[ACE_OS::strlen (rendezvous_point) + 1]);
+  ACE_OS::strcpy (this->rendezvous_point_, rendezvous_point);
+
+  this->create_body ();
+}
+
+TAO_UIOP_Profile::TAO_UIOP_Profile (const TAO_UIOP_Profile *pfile)
+  : TAO_Profile (pfile->tag ()),
+    rendezvous_point_(0),
+    body_(pfile->body_),
+    version_(pfile->version_),
+    object_key_(pfile->object_key_),
+    object_addr_(pfile->object_addr_),
+    hint_(0)
+{
+
+  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 TAO_UIOP_Profile &pfile)
   : TAO_Profile (pfile.tag ()),
     rendezvous_point_(0),
+    body_(pfile.body_),
     version_(pfile.version_),
     object_key_(pfile.object_key_),
     object_addr_(pfile.object_addr_),
-    hint_(0),
-    orb_core_ (pfile.orb_core_)
+    hint_(0)
 {
+
   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 TAO_IOP_Version &version)
+  : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
+    rendezvous_point_ (0),
+    body_ (),
+    version_ (version),
+    object_key_ (),
+    object_addr_ (),
+    hint_ (0)
+{
 }
 
 TAO_UIOP_Profile::TAO_UIOP_Profile (const char *string,
-                                    TAO_ORB_Core *orb_core,
                                     CORBA::Environment &env)
   : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
     rendezvous_point_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
+    body_ (),
+    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
     object_key_ (),
     object_addr_ (),
-    hint_ (0),
-    orb_core_ (orb_core)
+    hint_ (0)
 {
   parse_string (string, env);
 }
 
-TAO_UIOP_Profile::TAO_UIOP_Profile (TAO_ORB_Core *orb_core)
+TAO_UIOP_Profile::TAO_UIOP_Profile (void)
   : TAO_Profile (TAO_IOP_TAG_UNIX_IOP),
     rendezvous_point_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
+    body_ (),
+    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
     object_key_ (),
     object_addr_ (),
-    hint_ (0),
-    orb_core_ (orb_core)
+    hint_ (0)
 {
 }
 
@@ -111,7 +238,14 @@ TAO_UIOP_Profile::set (const ACE_UNIX_Addr& addr)
 
   ACE_OS::strcpy (this->rendezvous_point_, temp_rendezvous_point);
 
-  return 0;
+//   ACE_DEBUG ((LM_DEBUG,
+//               "UIOP_Profile::set -- \n"
+//               "   temp_rendezvous_point: <%s>\n"
+//               "   rendezvous_point:      <%s>\n",
+//               temp_rendezvous_point,
+//               this->rendezvous_point_));
+
+  return 0;  // Success
 }
 
 TAO_UIOP_Profile::~TAO_UIOP_Profile (void)
@@ -144,8 +278,8 @@ TAO_UIOP_Profile::parse_string (const char *string,
       // Skip over the "N.n@"
     }
 
-  if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
-      this->version_.minor  > TAO_DEF_GIOP_MINOR)
+  if (this->version_.major != TAO_UIOP_Profile::DEF_UIOP_MAJOR ||
+      this->version_.minor  > TAO_UIOP_Profile::DEF_UIOP_MINOR)
     {
       ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
     }
@@ -185,6 +319,39 @@ TAO_UIOP_Profile::parse_string (const char *string,
   return 1;
 }
 
+//  TAO_InputCDR cdr (body.get_buffer (), body.length (), body[0]);
+//
+// @@
+//  CORBA::Boolean byte_order;
+//  cdr >> CORBA::Any::to_boolean (byte_order);
+//  cdr >> this->version_.major;
+//  cdr >> this->version_.minor;
+//  cdr >> this->rendezvous_point_;
+//  cdr >> this->object_key_;
+//  this->object_addr_.set (this->rendezvous_point_);
+// }
+
+void
+TAO_UIOP_Profile::create_body (void)
+{
+}
+// @@
+//  TAO_OutputCDR cdr;
+//   cdr << TAO_ENCAP_BYTE_ORDER;
+//   cdr << this->version_.major;
+//   cdr << this->version_.minor;
+//   cdr << this->rendezvous_point_;
+//   cdr << this->object_key_;
+//
+//   // Create a copy by making a temporary TAO_opaque object.
+//   // @@ TODO the CDR stream may contain several fragments, need to
+//   // merge them...
+//   this->body_ = TAO_opaque (cdr.length (), // length
+//                             cdr.length (), // maximum
+//                             cdr.buffer (), // buffer
+//                             0);            // not own
+// }
+
 CORBA::Boolean
 TAO_UIOP_Profile::is_equivalent (TAO_Profile *other_profile,
                                  CORBA::Environment &env)
@@ -230,15 +397,13 @@ TAO_UIOP_Profile::hash (CORBA::ULong max,
   return hashval % max;
 }
 
-int
-TAO_UIOP_Profile::addr_to_string (char *buffer, size_t length)
+char *
+TAO_UIOP_Profile::addr_to_string (void)
 {
-  if (length < (ACE_OS::strlen (rendezvous_point_) + 1))
-    return -1;
-
-  ACE_OS::strcpy (buffer, this->rendezvous_point_);
-
-  return 0;
+  static char s[MAXPATHLEN + 1];
+  ACE_OS::sprintf (s, "%s",
+                   this->rendezvous_point_);
+  return s;
 }
 
 const char *
@@ -360,15 +525,15 @@ TAO_UIOP_Profile::decode (TAO_InputCDR& cdr)
   //         protocol?
 
   if (!(cdr.read_octet (this->version_.major)
-        && this->version_.major == TAO_DEF_GIOP_MAJOR
+        && this->version_.major == TAO_UIOP_Profile::DEF_UIOP_MAJOR
         && cdr.read_octet (this->version_.minor)
-        && this->version_.minor <= TAO_DEF_GIOP_MINOR))
+        && this->version_.minor <= TAO_UIOP_Profile::DEF_UIOP_MINOR))
   {
     ACE_DEBUG ((LM_DEBUG,
-                "detected new v%d.%d UIOP profile\n",
+                "detected new v%d.%d UIOP profile",
                 this->version_.major,
                 this->version_.minor));
-    return -1;
+    return 0;
   }
 
   if (this->rendezvous_point_)
@@ -391,11 +556,6 @@ TAO_UIOP_Profile::decode (TAO_InputCDR& cdr)
   if ((cdr >> this->object_key_) == 0)
     return -1;
 
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    if (this->tagged_components_.decode (cdr) == 0)
-      return -1;
-
   if (cdr.length () != 0 && TAO_debug_level)
     {
       // If there is extra data in the profile we are supposed to
@@ -425,35 +585,40 @@ TAO_UIOP_Profile::encode (TAO_OutputCDR &stream) const
   // handled by the object reference writer (IMHO).
   stream.write_ulong (TAO_IOP_TAG_UNIX_IOP);
 
-  // Create the encapsulation....
-  TAO_OutputCDR encap (ACE_CDR::DEFAULT_BUFSIZE,
-                       TAO_ENCAP_BYTE_ORDER,
-                       this->orb_core_->output_cdr_buffer_allocator (),
-                       this->orb_core_->output_cdr_dblock_allocator (),
-                       this->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                       this->orb_core_->to_iso8859 (),
-                       this->orb_core_->to_unicode ());
+  // UNSIGNED LONG, number of succeeding bytes in the
+  // encapsulation.  We don't actually need to make the
+  // encapsulation, as nothing needs stronger alignment than
+  // this longword; it guarantees the rest is aligned for us.
+
+  CORBA::ULong rendezvous_pointlen = ACE_OS::strlen ((char *) this->rendezvous_point_);
+  CORBA::ULong encap_len =
+    1                              // byte order
+    + 1                            // version major
+    + 1                            // version minor
+    + 1                            // pad byte
+    + 4                            // sizeof (strlen)
+    + rendezvous_pointlen + 1      // strlen + null
+    + (~rendezvous_pointlen & 0x3) // optional pad short
+    + 4                            // sizeof (key length)
+    + this->object_key_.length (); // key length.
+  stream.write_ulong (encap_len);
 
   // CHAR describing byte order, starting the encapsulation
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
+  stream.write_octet (TAO_ENCAP_BYTE_ORDER);
 
-  // The GIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
+  // UIOP::TAO_IOP_Version, two characters (version 1.0) padding
+  stream.write_char (this->version_.major);
+  stream.write_char (this->version_.minor);
 
   // STRING rendezvous_pointname from profile
-  encap.write_string (this->rendezvous_point_);
+  stream.write_string (this->rendezvous_point_);
 
-  // OCTET SEQUENCE for object key
-  encap << this->object_key_;
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    this->tagged_components_.encode (encap);
+//   ACE_DEBUG ((LM_DEBUG,
+//               "UIOP_Profile::encode -- rendezvous point: <%s>\n",
+//               this->rendezvous_point_));
 
-  // write the encapsulation as an octet sequence...
-  stream << CORBA::ULong (encap.total_length ());
-  stream.write_octet_array_mb (encap.begin ());
+  // OCTET SEQUENCE for object key
+  stream << this->object_key_;
 
   return 1;
 }
diff --git a/TAO/tao/UIOP_Profile.h b/TAO/tao/UIOP_Profile.h
index e8caee840c3..aa2db586572 100644
--- a/TAO/tao/UIOP_Profile.h
+++ b/TAO/tao/UIOP_Profile.h
@@ -21,16 +21,15 @@
 #ifndef TAO_UIOP_PROFILE_H
 #define TAO_UIOP_PROFILE_H
 
-#include "tao/Pluggable.h"
+#include "ace/Synch.h"
 
 # if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "ace/UNIX_Addr.h"
+
+#include "tao/Pluggable.h"
 #include "tao/Object_KeyC.h"
 #include "tao/UIOP_Connect.h"
-#include "tao/Tagged_Components.h"
-
-#include "ace/UNIX_Addr.h"
-#include "ace/Synch.h"
 
 //class TAO_UIOP_Client_Connection_Handler;
 
@@ -44,6 +43,13 @@ class TAO_Export TAO_UIOP_Profile : public TAO_Profile
   // = DESCRIPTION
   //   This class defines the UIOP profile.
 public:
+  // = Currently, TAO supports UIOP 1.0.
+  enum
+    {
+      DEF_UIOP_MAJOR = 1,  // FIXME:  Version numbers?
+      DEF_UIOP_MINOR = 0
+    };
+
   static const char object_key_delimiter;
   // The object key delimiter that UIOP uses or expects.
 
@@ -51,32 +57,55 @@ public:
   // Return the char string prefix.
 
   TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                    const TAO_ObjectKey &object_key,
-                    const TAO_GIOP_Version &version,
-                    TAO_ORB_Core *orb_core);
+                    const char *object_key);
+  // Profile constructor, the rendezvous_point field derived derived from
+  // addr.
+
+  TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
+                    const TAO_ObjectKey &object_key);
   // Profile constructor, same as above except the object_key has
   // already been marshaled.  (actually, no marshalling for this protocol)
 
+  TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
+                    const TAO_IOP_Version &version,
+                    const char *object_key);
+  // Profile constructor, explicitly define the protocol version.
+
+  TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
+                    const TAO_IOP_Version &version,
+                    const TAO_ObjectKey &object_key);
+  // Profile constructor, explicitly define the protocol version.
+
   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);
+                    const ACE_UNIX_Addr &addr);
+  // Profile constructor
+
+  TAO_UIOP_Profile (const char *rendevous_point,
+                    const TAO_ObjectKey &object_key);
   // Profile constructor
 
+  TAO_UIOP_Profile (const char *rendezvous_point,
+                    const TAO_IOP_Version &version,
+                    const TAO_ObjectKey &object_key);
+  // Profile constructor, explicitly define the protocol version
+  // FIXME:  What do we do about versions?
+
   TAO_UIOP_Profile (const char *string,
-                    TAO_ORB_Core *orb_core,
                     CORBA::Environment &env);
   // Create object using a string ior.
 
+  TAO_UIOP_Profile (const TAO_UIOP_Profile *pfile);
+  // Profile copy constructor
+
   TAO_UIOP_Profile (const TAO_UIOP_Profile &pfile);
   // Profile copy constructor
 
-  TAO_UIOP_Profile (TAO_ORB_Core *orb_core);
-  // Profile constructor, default.
+  TAO_UIOP_Profile (const TAO_IOP_Version &version);
+  // Profile constructor, explicitly define the version.
 
-  TAO_UIOP_Profile & operator= (const TAO_UIOP_Profile &src);
-  // Assignment operator
+  TAO_UIOP_Profile (void);
+  // Profile constructor, default.
 
   ~TAO_UIOP_Profile (void);
   // Destructor is to be called only through <_decr_refcnt>.
@@ -89,6 +118,9 @@ public:
   // Return a string representation for this profile.
   // client must deallocate memory.
 
+  const TAO_opaque& body (void) const;
+  // Create UIOP_Profile Object from marshalled data.
+
   int decode (TAO_InputCDR& cdr);
   // Initialize this object using the given CDR octet string.
 
@@ -102,7 +134,7 @@ public:
   TAO_ObjectKey &object_key (TAO_ObjectKey& objkey);
   // @@ deprecated. set the Object Key.
 
-  TAO_ObjectKey *_key (void) const;
+  TAO_ObjectKey *_key (CORBA::Environment &env) const;
   // Return a pointer to the Object Key.
 
   CORBA::Boolean is_equivalent (TAO_Profile *other_profile,
@@ -115,7 +147,7 @@ public:
                      CORBA::Environment &env);
   // Return a hash value for this object.
 
-  int addr_to_string (char *buffer, size_t length);
+  char *addr_to_string (void);
   // Return a string representation for the address.
 
   const ACE_UNIX_Addr &object_addr (void) const;
@@ -130,31 +162,42 @@ public:
   // resulting pointer.
   // This object maintains ownership of this string.
 
-  const TAO_GIOP_Version &version (void) const;
+  const TAO_IOP_Version *version (void);
   // Return a pointer to this profile's version.  This object
   // maintains ownership.
 
+  const TAO_IOP_Version *version (TAO_IOP_Version *v);
+  // First set the version then return a pointer to it.  This object
+  // maintains ownership.
+
   TAO_UIOP_Client_Connection_Handler *&hint (void);
   // This is a hint for which connection handler to use.
 
   void reset_hint (void);
   // Reset the hint's value.
 
-  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
+  TAO_Profile *_nil (void);
+  // Return a null object pointer.
+
+  TAO_UIOP_Profile & operator= (const TAO_UIOP_Profile &src);
+  // Assignment operator
 
 private:
   int set (const ACE_UNIX_Addr &addr);
   // helper method to set the UNIX_Addr.
 
+  void create_body (void);
+  // Does the work for <add_profile>.
+
 private:
 
   char *rendezvous_point_;
   // String representing the rendezvous point.
 
-  TAO_GIOP_Version version_;
+  TAO_opaque body_;
+  // Marshaled profile (CDR).
+
+  TAO_IOP_Version version_;
   // UIOP version number.
 
   TAO_ObjectKey object_key_;
@@ -170,12 +213,6 @@ private:
 
   TAO_MProfile *forward_to_;
   // list of profiles which we should try forwarding on.
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core.
-
-  TAO_Tagged_Components tagged_components_;
-  // The tagged components
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/UIOP_Profile.i b/TAO/tao/UIOP_Profile.i
index 498384e8945..2a69ed13cc8 100644
--- a/TAO/tao/UIOP_Profile.i
+++ b/TAO/tao/UIOP_Profile.i
@@ -17,11 +17,17 @@ TAO_UIOP_Profile::object_key (TAO_ObjectKey& objkey)
 }
 
 ACE_INLINE TAO_ObjectKey *
-TAO_UIOP_Profile::_key (void) const
+TAO_UIOP_Profile::_key (CORBA::Environment &) const
 {
   return new TAO_ObjectKey (this->object_key_);
 }
 
+ACE_INLINE const TAO_opaque&
+TAO_UIOP_Profile::body (void) const
+{
+  return this->body_;
+}
+
 ACE_INLINE const ACE_UNIX_Addr&
 TAO_UIOP_Profile::object_addr (void) const
 {
@@ -34,28 +40,29 @@ TAO_UIOP_Profile::rendezvous_point (void)
   return this->rendezvous_point_;
 }
 
-ACE_INLINE const TAO_GIOP_Version &
-TAO_UIOP_Profile::version (void) const
+ACE_INLINE const TAO_IOP_Version *
+TAO_UIOP_Profile::version (void)
 {
-  return this->version_;
+  return &this->version_;
 }
 
-ACE_INLINE TAO_UIOP_Client_Connection_Handler *&
-TAO_UIOP_Profile::hint (void)
+ACE_INLINE const TAO_IOP_Version *
+TAO_UIOP_Profile::version (TAO_IOP_Version *v)
 {
-  return this->hint_;
+  this->version_ = *v;
+  return &this->version_;
 }
 
-ACE_INLINE const TAO_Tagged_Components&
-TAO_UIOP_Profile::tagged_components (void) const
+ACE_INLINE TAO_UIOP_Client_Connection_Handler *&
+TAO_UIOP_Profile::hint (void)
 {
-  return this->tagged_components_;
+  return this->hint_;
 }
 
-ACE_INLINE TAO_Tagged_Components&
-TAO_UIOP_Profile::tagged_components (void)
+ACE_INLINE TAO_Profile *
+TAO_UIOP_Profile::_nil (void)
 {
-  return this->tagged_components_;
+  return (TAO_UIOP_Profile *) 0;
 }
 
 #endif  /* !defined ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
index c253800bf63..8c74fa2ca7f 100644
--- a/TAO/tao/UIOP_Transport.cpp
+++ b/TAO/tao/UIOP_Transport.cpp
@@ -5,7 +5,6 @@
 
 #include "tao/UIOP_Transport.h"
 #include "tao/UIOP_Connect.h"
-#include "tao/UIOP_Profile.h"
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
 #include "tao/Transport_Mux_Strategy.h"
@@ -59,47 +58,14 @@ TAO_UIOP_Transport::~TAO_UIOP_Transport (void)
 {
 }
 
-TAO_UIOP_Handler_Base *&
-TAO_UIOP_Transport::handler (void)
-{
-  return this->handler_;
-}
-
-int
-TAO_UIOP_Transport::idle (void)
-{
-  return this->handler_->idle();
-}
-
-void
-TAO_UIOP_Transport::close_connection (void)
-{
-  this->handler_->handle_close ();
-}
-
-ACE_HANDLE
-TAO_UIOP_Transport::handle (void)
-{
-  return this->handler_->get_handle ();
-}
-
-// ****************************************************************
-
 TAO_UIOP_Server_Transport::
     TAO_UIOP_Server_Transport (TAO_UIOP_Server_Connection_Handler *handler,
                                TAO_ORB_Core* orb_core)
   : TAO_UIOP_Transport (handler, orb_core),
-    server_handler_ (handler),
-    message_state_ (orb_core)
-{
-}
-
-TAO_UIOP_Server_Transport::~TAO_UIOP_Server_Transport (void)
+    server_handler_ (handler)
 {
 }
 
-// ****************************************************************
-
 TAO_UIOP_Client_Transport::
     TAO_UIOP_Client_Transport (TAO_UIOP_Client_Connection_Handler *handler,
                                TAO_ORB_Core *orb_core)
@@ -109,6 +75,10 @@ TAO_UIOP_Client_Transport::
 {
 }
 
+TAO_UIOP_Server_Transport::~TAO_UIOP_Server_Transport (void)
+{
+}
+
 TAO_UIOP_Client_Transport::~TAO_UIOP_Client_Transport (void)
 {
 }
@@ -119,84 +89,34 @@ TAO_UIOP_Client_Transport::client_handler (void)
   return this->client_handler_;
 }
 
-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_Server_Connection_Handler *
+TAO_UIOP_Server_Transport::server_handler (void)
 {
-  const TAO_UIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_UIOP_Profile*,pfile);
-
-  // Obtain object key.
-  const TAO_ObjectKey& key = profile->object_key ();
+  return this->server_handler_;
+}
 
-  // @@ This should be implemented in the transport object, which
-  //    would query the profile to obtain the version...
-  if (TAO_GIOP::start_message (profile->version (),
-                               TAO_GIOP::Request,
-                               output,
-                               orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
+TAO_UIOP_Handler_Base *&
+TAO_UIOP_Transport::handler (void)
+{
+  return this->handler_;
+}
 
-  // Then fill in the rest of the RequestHeader
-  //
-  // The first element of header is service context list;
-  // transactional context would be acquired here using the
-  // transaction service APIs.  Other kinds of context are as yet
-  // undefined.
-  //
-  // Last element of request header is the principal; no portable way
-  // to get it, we just pass empty principal (convention: indicates
-  // "anybody").  Steps upward in security include passing an
-  // unverified user ID, and then verifying the message (i.e. a dummy
-  // service context entry is set up to hold a digital signature for
-  // this message, then patched shortly before it's sent).
-  static CORBA::Principal_ptr principal = 0;
-
-  if (TAO_GIOP::write_request_header (request_id,
-                                      is_roundtrip,
-                                      key,
-                                      opname,
-                                      principal,
-                                      output,
-                                      orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
+int
+TAO_UIOP_Transport::idle (void)
+{
+  return this->handler_->idle();
 }
 
 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_Transport::close_connection (void)
 {
-  const TAO_UIOP_Profile* profile =
-    ACE_dynamic_cast(const TAO_UIOP_Profile*,pfile);
-
-  // Obtain object key.
-  const TAO_ObjectKey& key = profile->object_key ();
-
-  // @@ This should be implemented in the transport object, which
-  //    would query the profile to obtain the version...
-  if (TAO_GIOP::start_message (profile->version (),
-                               TAO_GIOP::Request,
-                               output,
-                               orb_core) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
-
+  this->handler_->handle_close ();
+}
 
-  if (TAO_GIOP::write_locate_request_header (this->request_id (),
-                                             key,
-                                             output) != 0)
-    ACE_THROW (CORBA::MARSHAL ());
+ACE_HANDLE
+TAO_UIOP_Transport::handle (void)
+{
+  return this->handler_->get_handle ();
 }
 
 int
@@ -247,12 +167,13 @@ TAO_UIOP_Client_Transport::handle_client_input (int block)
   //    removed.
   //    Do I make any sense?
 
-  TAO_GIOP_Message_State* message_state =
-    this->tms_->get_message_state ();
+  TAO_InputCDR* cdr = this->tms_->get_cdr_stream ();
 
   int result = TAO_GIOP::handle_input (this,
                                        this->orb_core_,
-                                       *message_state);
+                                       this->message_header_,
+                                       this->current_offset_,
+                                       *cdr);
   if (result == -1)
     {
       if (TAO_debug_level > 0)
@@ -266,13 +187,17 @@ TAO_UIOP_Client_Transport::handle_client_input (int block)
 
   // OK, the complete message is here...
 
+  TAO_GIOP_MessageHeader header_copy = this->message_header_;
+  this->message_header_.message_size = 0;
+
   TAO_GIOP_ServiceContextList reply_ctx;
   CORBA::ULong request_id;
   CORBA::ULong reply_status;
 
   result = TAO_GIOP::parse_reply (this,
                                   this->orb_core_,
-                                  *message_state,
+                                  *cdr,
+                                  header_copy,
                                   reply_ctx,
                                   request_id,
                                   reply_status);
@@ -282,28 +207,26 @@ TAO_UIOP_Client_Transport::handle_client_input (int block)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO (%P|%t) - %p\n",
                     "UIOP_Transport::handle_client_input, parse reply"));
-      message_state->reset ();
       return -1;
     }
 
   if (this->tms_->dispatch_reply (request_id,
                                   reply_status,
-                                  message_state->giop_version,
+                                  header_copy.giop_version,
                                   reply_ctx,
-                                  message_state) != 0)
+                                  cdr) != 0)
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
                     "TAO (%P|%t) : UIOP_Client_Transport::"
                     "handle_client_input - "
                     "dispatch reply failed\n"));
-      message_state->reset ();
       return -1;
     }
 
   // 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);
+  this->destroy_cdr_stream (cdr);
 
   // Return something to indicate the reply is received.
   return 1;
diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h
index d9a999f4a3f..1e0537fa791 100644
--- a/TAO/tao/UIOP_Transport.h
+++ b/TAO/tao/UIOP_Transport.h
@@ -22,7 +22,6 @@
 #define TAO_UIOP_TRANSPORT_H
 
 #include "tao/Pluggable.h"
-#include "tao/GIOP.h"
 
 # if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
@@ -39,7 +38,7 @@ class TAO_Export TAO_UIOP_Transport : public TAO_Transport
   //   connection handler (handler_).
   //
   // = DESCRIPTION
-  //   Implements common IIOP methods for the Transport adaptor class.
+  //   @@ Fred, please fill in here.
 public:
   TAO_UIOP_Transport (TAO_UIOP_Handler_Base *handler,
                       TAO_ORB_Core *orb_core);
@@ -111,7 +110,7 @@ class TAO_Export TAO_UIOP_Client_Transport : public TAO_UIOP_Transport
   //   server.
   //
   // = DESCRIPTION
-  //   Implements the methods specific to the client.
+  //   @@ Fred, please fill in here.
 public:
   TAO_UIOP_Client_Transport (TAO_UIOP_Client_Connection_Handler *handler,
                              TAO_ORB_Core *orb_core);
@@ -125,24 +124,6 @@ public:
   TAO_UIOP_Client_Connection_Handler *client_handler (void);
   // return a pointer to the client's connection handler.
 
-  virtual void start_request (TAO_ORB_Core *orb_core,
-                              const TAO_Profile *profile,
-                              const char* opname,
-                              CORBA::ULong request_id,
-                              CORBA::Boolean is_twoway,
-                              TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Fill into <output> the right headers to make a request.
-
-  virtual void start_locate (TAO_ORB_Core *orb_core,
-                             const TAO_Profile *profile,
-                             CORBA::ULong request_id,
-                             TAO_OutputCDR &output,
-                             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);
@@ -168,6 +149,11 @@ protected:
 private:
   TAO_UIOP_Client_Connection_Handler *client_handler_;
   // pointer to the corresponding client side connection handler.
+
+  TAO_GIOP_MessageHeader message_header_;
+  CORBA::ULong current_offset_;
+  // This keep the state of the current message, to enable
+  // non-blocking reads.
 };
 
 // ****************************************************************
@@ -191,12 +177,12 @@ public:
   ~TAO_UIOP_Server_Transport (void);
   // Default destructor
 
+  TAO_UIOP_Server_Connection_Handler *server_handler (void);
+  //  Return a pointer to the underlying connection handler.
+
+private:
   TAO_UIOP_Server_Connection_Handler *server_handler_;
   // Pointer to the corresponding connection handler.
-
-  TAO_GIOP_Message_State message_state_;
-  // This keep the state of the current message, to enable
-  // non-blocking reads, fragment reassembly, etc.
 };
 
 # endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp
index e32b0145db9..e3f64fcebe6 100644
--- a/TAO/tao/ValueBase.cpp
+++ b/TAO/tao/ValueBase.cpp
@@ -27,6 +27,20 @@
 
 ACE_RCSID(tao, ValueBase, "$Id$")
 
+void
+CORBA::add_ref (CORBA::ValueBase *val)
+{
+  if (val)
+    val->_add_ref ();
+}
+
+void
+CORBA::remove_ref (CORBA::ValueBase *val)
+{
+  if (val)
+    val->_remove_ref ();
+}
+
 // destructor
 CORBA_ValueBase::~CORBA_ValueBase (void)
 {
diff --git a/TAO/tao/ValueBase.i b/TAO/tao/ValueBase.i
index 4117def9904..b71395cf9dc 100644
--- a/TAO/tao/ValueBase.i
+++ b/TAO/tao/ValueBase.i
@@ -3,20 +3,6 @@
 
 // static operations in namespace CORBA ========================
 
-ACE_INLINE void
-CORBA::add_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    val->_add_ref ();
-}
-
-ACE_INLINE void
-CORBA::remove_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    val->_remove_ref ();
-}
-
 // ===========================================================
 
 // constructor
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 3f2a44abec2..09755f69a8d 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -3,5 +3,5 @@
 
 #define TAO_MAJOR_VERSION 0
 #define TAO_MINOR_VERSION 3
-#define TAO_BETA_VERSION 24
-#define TAO_VERSION "0.3.24"
+#define TAO_BETA_VERSION 23
+#define TAO_VERSION "0.3.23"
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index f380e853eac..36d2277a63d 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -270,23 +270,24 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
 
       // get the profile ID tag
       if ((continue_append = (src->read_ulong (tag) ?
-                              dest->write_ulong (tag) : 0))  == 0)
+                              dest->write_ulong (tag) : 0))
+          == 0)
         continue;
 
-      CORBA::ULong length;
-      if ((continue_append = (src->read_ulong (length)
-                              ? dest->write_ulong (length) : 0)) == 0)
-        continue;
+      if (tag != TAO_IOP_TAG_INTERNET_IOP)
+        {
+          continue_append = dest->append_string (*src);
+          continue;
+        }
+
+      // OK, we've got an IIOP profile.  It's going to be
+      // encapsulated ProfileData.  Create a new decoding stream and
+      // context for it, and tell the "parent" stream that this data
+      // isn't part of it any more.
 
-      // @@ This can be optimized! Pre-allocating on the destination
-      //    and then copying directly into that.
-      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;
+      // ProfileData is encoded as an encapsulated sequence of octets.
+      continue_append = (dest->append (TC_opaque, src, env) ==
+                         CORBA::TypeCode::TRAVERSE_CONTINUE) ? 1 : 0;
     }
 
   if (continue_append == 1)
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
index 4071ed47450..a995d68d9fc 100644
--- a/TAO/tao/corbafwd.cpp
+++ b/TAO/tao/corbafwd.cpp
@@ -7,6 +7,19 @@
 #endif /* ! __ACE_INLINE__ */
 
 CORBA::String
+CORBA::string_alloc (CORBA::ULong len)
+{
+  // Allocate 1 + strlen to accomodate the null terminating character.
+  return new CORBA::Char[size_t (len + 1)];
+}
+
+void
+CORBA::string_free (CORBA::Char *str)
+{
+  delete [] str;
+}
+
+CORBA::String
 CORBA::string_dup (const CORBA::Char *str)
 {
   if (!str)
@@ -26,6 +39,18 @@ CORBA::string_dup (const CORBA::Char *str)
 // ----------------------------------------------------------------------
 
 CORBA::WChar*
+CORBA::wstring_alloc (CORBA::ULong len)
+{
+  return new CORBA::WChar [(size_t) (len + 1)];
+}
+
+void
+CORBA::wstring_free (CORBA::WChar *const str)
+{
+  delete [] str;
+}
+
+CORBA::WChar*
 CORBA::wstring_dup (const WChar *const str)
 {
   if (!str)
@@ -37,6 +62,12 @@ CORBA::wstring_dup (const WChar *const str)
 
 // ****************************************************************
 
+CORBA_Environment&
+CORBA::default_environment ()
+{
+  return TAO_default_environment ();
+}
+
 ACE_RCSID(tao, corbafwd, "$Id$")
 
 TAO_NAMESPACE_TYPE (const CORBA::ServiceType)
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 7b2b140f100..e3b2c08859f 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -348,7 +348,7 @@ typedef void (*TAO_Skeleton)(
 
 // forward declare sequences.
 template <class T> class TAO_Unbounded_Sequence;
-template <class T,class T_var> class TAO_Unbounded_Object_Sequence;
+template <class T> class TAO_Unbounded_Object_Sequence;
 
 // Provide a simple function to access the TSS default environment.
 // We tried with CORBA_Environment::default_environment (),
@@ -405,9 +405,9 @@ TAO_NAMESPACE CORBA
   typedef Char *String;
 
   // = String memory management.
-  TAO_NAMESPACE_INLINE_FUNCTION Char* string_alloc (ULong len);
+  TAO_NAMESPACE_STORAGE_CLASS Char* string_alloc (ULong len);
   TAO_NAMESPACE_STORAGE_CLASS Char* string_dup (const Char *);
-  TAO_NAMESPACE_INLINE_FUNCTION void string_free (Char *);
+  TAO_NAMESPACE_STORAGE_CLASS void string_free (Char *);
 
   // This is a TAO extension and must go away....
   TAO_NAMESPACE_STORAGE_CLASS Char* string_copy (const Char *);
@@ -422,9 +422,9 @@ TAO_NAMESPACE CORBA
   // Out type for WChar.
 
   // = String memory management routines.
-  TAO_NAMESPACE_INLINE_FUNCTION WChar* wstring_alloc (ULong len);
+  TAO_NAMESPACE_STORAGE_CLASS WChar* wstring_alloc (ULong len);
   TAO_NAMESPACE_STORAGE_CLASS WChar* wstring_dup (const WChar *const);
-  TAO_NAMESPACE_INLINE_FUNCTION void wstring_free (WChar *const);
+  TAO_NAMESPACE_STORAGE_CLASS void wstring_free (WChar *const);
 
   typedef CORBA_WString_var WString_var;
   typedef CORBA_WString_out WString_out;
@@ -528,8 +528,8 @@ TAO_NAMESPACE CORBA
   typedef CORBA_ValueFactoryBase *ValueFactory_ptr;
   // own invention, more readable
   typedef CORBA_DefaultValueRefCountBase  DefaultValueRefCountBase;
-  TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueBase *);
-  TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueBase *);
+  TAO_NAMESPACE_STORAGE_CLASS void add_ref (ValueBase *);
+  TAO_NAMESPACE_STORAGE_CLASS void remove_ref (ValueBase *);
 #endif /* TAO_HAS_VALUETYPE */
 
   // enum values defined in nvlist.hh, bitwise ORed.
@@ -564,36 +564,36 @@ TAO_NAMESPACE CORBA
     typedef CORBA_UnknownUserException UnknownUserException;
 
   // = all the CORBA::is_nil methods.
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Object_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ServerRequest_ptr req);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (Object_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (Environment_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (TypeCode_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (ORB_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (Principal_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (ServerRequest_ptr req);
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Request_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Context_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (Request_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (NamedValue_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (NVList_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS Boolean is_nil (Context_ptr);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   // = all the CORBA release methods.
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Object_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (ServerRequest_ptr req);
+  TAO_NAMESPACE_STORAGE_CLASS void release (Object_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS void release (Environment_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS void release (Principal_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS void release (TypeCode_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS void release (ORB_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS void release (ServerRequest_ptr req);
 
 #if !defined (TAO_HAS_MINIMUM_CORBA)
 
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Request_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (Context_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS void release (Request_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS void release (NamedValue_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS void release (NVList_ptr);
+  TAO_NAMESPACE_STORAGE_CLASS void release (Context_ptr);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -892,7 +892,7 @@ TAO_NAMESPACE CORBA
 
   // = TAO extensions...
 
-  TAO_NAMESPACE_INLINE_FUNCTION CORBA_Environment& default_environment (void);
+  TAO_NAMESPACE_STORAGE_CLASS CORBA_Environment& default_environment (void);
 
   // Obtain the thread-specific default environment.
   // This is obsolete and only left here for backwards compatibility.
@@ -901,63 +901,22 @@ TAO_NAMESPACE CORBA
 
 // ****************************************************************
 
-// Several OMG assigned numbers, for a complete list check:
-//
-// ftp://ftp.omg.org/pub/docs/ptc/99-05-02.txt
-//
-// For details on how to ask more numbers check:
-//
-// http://www.omg.org/cgi-bin/doc?ptc/99-02-01 
-//
-
-// These numbers were assigned by the OMG.  Do *NOT* change.
-// The ASCII representation is "TAO\x00", we can request more ORB
-// types later.
-#define TAO_ORB_TYPE 0x54414f00U
-
-// We reserved the range 0x54414f00 - 0x54414f0f with the OMG to
-// define our own profile ids in TAO.
-#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 */
-// #define TAO_TAG_SHMEM_PROFILE  0x54414f02U /* Shared memory */
-// #define TAO_TAG_MSGQ_PROFILE   0x54414f03U /* Message Queue */
-// #define TAO_TAG_UDP_PROFILE    0x54414f04U /* UDP */
-// #define TAO_TAG_MCAST_PROFILE  0x54414f05U /* IP/Multicast */
-// #define TAO_TAG_CPCI_PROFILE   0x54414f06U /* Compact/PCI */
-// #define TAO_TAG_VME_PROFILE    0x54414f07U /* VME Bus */
-// #define TAO_TAG_NTNP_PROFILE   0x54414f08U /* NT Named Pipes */
-// #define TAO_TAG_HTTPNG_PROFILE 0x54414f09U /* HTTP-NG */
-// #define TAO_TAG_PIPE_PROFILE   0x54414f0AU /* Pipe */
-// #define TAO_TAG_XXXX_PROFILE   0x54414f0BU /* ???? */
-
-// We reserved the range 0x54414f00 - 0x54414f0f with the OMG to
-// define our own profile tagged components in TAO.
-
-// Store the priority range in the *server* so the client can choose
-// the right endpoint
-#define TAO_TAG_PRIORITY_RANGE 0x54414f00U
-// #define TAO_TAG_ANOTHER_COMPONENT 0x54414f01U
-
-// We reserved the range 0x54414f00 - 0x54414f0f with the OMG to
-// define our own service context list entries.
-// #define TAO_SOME_SVC_CONTEXT_ENTRY 0x54414f00U
-
 // This number was assigned by the OMG.  Do *NOT* change at random.
-// The ASCII representation is TA0xxxx, close enough since they only
+// The ASCII represetantion is TA0xxxx, close enough since they only
 // take 20 bits, the first 16 are TA, the next 4 are 0000.  Remember
 // that we can only play with the last 12 bits, TAO_MAX_MINOR_CODE is
 // there to remind us of that.
 #define TAO_DEFAULT_MINOR_CODE 0x54410000
 #define TAO_MAX_MINOR_CODE 0x54410FFF
 
-// Minor code encoding.  Encode the location in 8 bits, and the errno
-// in 4 bits:
+// Minor code encoding.  Skip 4 bits, currently unused.  Then, encode
+// the location in 4 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.
+// Location encoding:  next-to-last 8 bits.
+
+// For TRANSIENT...
 #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)
@@ -973,26 +932,8 @@ TAO_NAMESPACE CORBA
 #define TAO_EMFILE_MINOR_CODE       0x3U
 #define TAO_EPIPE_MINOR_CODE        0x4U
 #define TAO_ECONNREFUSED_MINOR_CODE 0x5U
-#define TAO_ENOENT_MINOR_CODE       0x6U
-#define TAO_EBADF_MINOR_CODE        0x7U
-#define TAO_ENOSYS_MINOR_CODE       0x8U
-#define TAO_EPERM_MINOR_CODE        0x9U
-#define TAO_EAFNOSUPPORT_MINOR_CODE 0xAU
 #define TAO_UNKNOWN_MINOR_CODE      0xFU
 
-// These numbers are assigned by the OpenGroup, a database is
-// available at
-//
-// ftp://ftp.opengroup.orb/pub/codeset_registry/
-//
-#define TAO_CODESET_ID_ISO8859_1 0x00010001U
-#define TAO_CODESET_ID_UNICODE   0x00010109U
-
-// These are the default codesets that TAO declares, of course they
-// will be different on each platform, once the complete support for
-// character sets is implemented
-#define TAO_DEFAULT_CHAR_CODESET_ID  TAO_CODESET_ID_ISO8859_1
-#define TAO_DEFAULT_WCHAR_CODESET_ID TAO_CODESET_ID_UNICODE
 
 // ****************************************************************
 
diff --git a/TAO/tao/corbafwd.i b/TAO/tao/corbafwd.i
index a0874e1b457..cfa1da318d3 100644
--- a/TAO/tao/corbafwd.i
+++ b/TAO/tao/corbafwd.i
@@ -1,32 +1 @@
 // $Id$
-
-ACE_INLINE CORBA::String
-CORBA::string_alloc (CORBA::ULong len)
-{
-  // Allocate 1 + strlen to accomodate the null terminating character.
-  return new CORBA::Char[size_t (len + 1)];
-}
-
-ACE_INLINE void
-CORBA::string_free (CORBA::Char *str)
-{
-  delete [] str;
-}
-
-ACE_INLINE CORBA::WChar*
-CORBA::wstring_alloc (CORBA::ULong len)
-{
-  return new CORBA::WChar [(size_t) (len + 1)];
-}
-
-ACE_INLINE void
-CORBA::wstring_free (CORBA::WChar *const str)
-{
-  delete [] str;
-}
-
-ACE_INLINE CORBA_Environment&
-CORBA::default_environment ()
-{
-  return TAO_default_environment ();
-}
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
index 858be4c11f1..9c8bb56062d 100644
--- a/TAO/tao/decode.cpp
+++ b/TAO/tao/decode.cpp
@@ -66,7 +66,7 @@ TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr  tc,
                                const void *data,
                                const void *,
                                void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   CORBA::Boolean continue_decoding = 1;
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
@@ -110,16 +110,17 @@ TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr  tc,
       retval = CORBA::TypeCode::TRAVERSE_STOP;
       // we are not a primitive type
     }
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || continue_decoding != 1)
+  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+      && continue_decoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Primitive::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,
+                            CORBA::TypeCode::TRAVERSE_STOP);
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
 CORBA::TypeCode::traverse_status
@@ -127,7 +128,7 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
                          const void *data,
                          const void *,
                          void *context,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   CORBA::Any *any = (CORBA::Any *) data;
 
@@ -145,8 +146,8 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
   retval = stream->decode (CORBA::_tc_TypeCode,
                            &elem_tc.out (),
                            0,
-                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
+                           env);
+  TAO_CHECK_ENV_RETURN (env, retval);
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
     return retval;
 
@@ -182,8 +183,8 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
   TAO_InputCDR temp (*stream);
 
   begin = stream->rd_ptr ();
-  retval = temp.skip (elem_tc.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
+  retval = temp.skip (elem_tc.in (), env);
+  TAO_CHECK_ENV_RETURN (env, retval);
 
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
     return retval;
@@ -197,15 +198,15 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
   // @@EXC@@ This doesn't seem to be exception safe.
   TAO_OutputCDR out (end - begin + 2 * ACE_CDR::MAX_ALIGNMENT);
 
-  retval = out.append (elem_tc.in (), stream, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
+  retval = out.append (elem_tc.in (), stream, env);
+  TAO_CHECK_ENV_RETURN (env, retval);
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
     return retval;
 
   ACE_Message_Block::release (any->cdr_);
   if (any->any_owns_data_ && any->value_ != 0)
-    DEEP_FREE (any->type_, any->value_, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+    DEEP_FREE (any->type_, any->value_, 0, env);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
   any->cdr_ = ACE_Message_Block::duplicate (out.begin ());
   any->value_ = 0;
@@ -221,8 +222,7 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Any::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        retval);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
     }
   return retval;
 }
@@ -232,7 +232,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
                               const void *data,
                               const void *parent_typecode,
                               void *context,
-                              CORBA::Environment  &ACE_TRY_ENV)
+                              CORBA::Environment  &env)
 {
   CORBA::Boolean continue_decoding = 1;
 
@@ -313,7 +313,8 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
               // have nonempty parameter lists ...
             default:
               // Error: missed a case!
-              ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
+              env.exception (new CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+              return CORBA::TypeCode::TRAVERSE_STOP;
 
               // Some have "simple" parameter lists ... some of these
               // also have preallocated constants that could be used.
@@ -391,7 +392,10 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
             case ~0u:
               {
                 if (parent_typecode == 0)
-                    ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
+                  {
+                    env.exception (new CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                    return CORBA::TypeCode::TRAVERSE_STOP;
+                  }
 
                 // Get the long indicating the encapsulation offset,
                 // then set up indirection stream that's like "stream"
@@ -519,23 +523,25 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
         }
       else // bad kind_ value to be decoded
         {
+          env.exception (new CORBA::BAD_TYPECODE ());
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
                         "TAO_Marshal_TypeCode:decode: "
                         "Bad kind_ value in CDR stream\n"));
-          ACE_THROW_RETURN ( CORBA::BAD_TYPECODE (), CORBA::TypeCode::TRAVERSE_STOP);
+          return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
 
-  if (continue_decoding != 1)
+  if (continue_decoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
       if (TAO_debug_level)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_TypeCode::decode 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;
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
 // Encode Principal.
@@ -545,7 +551,7 @@ TAO_Marshal_Principal::decode (CORBA::TypeCode_ptr,
                                const void *data,
                                const void *,
                                void *context,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   // Context is the CDR stream.
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
@@ -555,8 +561,8 @@ TAO_Marshal_Principal::decode (CORBA::TypeCode_ptr,
   if ((*stream >> x) == 0)
     {
       *(CORBA_Principal_ptr*)data = CORBA::Principal::_nil ();
-      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_Principal **)data = x;
@@ -569,7 +575,7 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr,
                             const void *data, // where the result will go
                             const void *,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   // Context is the CDR stream.
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
@@ -579,7 +585,8 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr,
   if ((*stream >> object) == 0)
     {
       *(CORBA_Object_ptr*)data = CORBA::Object::_nil ();
-      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_Object **)data = object;
@@ -592,7 +599,7 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
                             const void *data,
                             const void *,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
   CORBA::TypeCode::traverse_status retval =
@@ -604,120 +611,130 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
   void *start_addr = (void *)data;
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  int member_count = tc->member_count (env);
 
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_decoding == 1;
-       i++)
-    {
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      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_)
-        {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-          break;
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-          continue_decoding =
-            stream->read_short (*(CORBA::Short *) data);
-          break;
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-          continue_decoding =
-            stream->read_long (*(CORBA::Long *) data);
-          break;
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-          continue_decoding =
-            stream->read_longlong (*(CORBA::LongLong *) data);
-          break;
-        case CORBA::tk_boolean:
-          continue_decoding =
-            stream->read_boolean (*(CORBA::Boolean *) data);
-          break;
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-          continue_decoding =
-            stream->read_char (*(CORBA::Char *) data);
-          break;
-        case CORBA::tk_longdouble:
-          continue_decoding =
-            stream->read_longdouble (*(CORBA::LongDouble *) data);
-          break;
-        case CORBA::tk_wchar:
-          continue_decoding =
-            stream->read_wchar (*(CORBA::WChar *) data);
-          break;
-        case CORBA::tk_TypeCode:
-        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:
-          retval = stream->decode (param, data, 0, ACE_TRY_ENV);
-          break;
-
-        case CORBA::tk_objref:
+  if (env.exception () == 0)
+    for (int i = 0; i < member_count
+           && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+           && continue_decoding == 1;
+         i++)
+      {
+        param = tc->member_type (i, env);
+        if (env.exception () == 0)
           {
-            CORBA_Object_ptr object;
-            retval = stream->decode (param, &object, 0, ACE_TRY_ENV);
-            ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-            if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+            size = param->size (env);
+            if (env.exception () == 0)
               {
-                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);
+                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_decoding =
+                          stream->read_short (*(CORBA::Short *) data);
+                        break;
+                      case CORBA::tk_long:
+                      case CORBA::tk_ulong:
+                      case CORBA::tk_float:
+                      case CORBA::tk_enum:
+                        continue_decoding =
+                          stream->read_long (*(CORBA::Long *) data);
+                        break;
+                      case CORBA::tk_double:
+                      case CORBA::tk_longlong:
+                      case CORBA::tk_ulonglong:
+                        continue_decoding =
+                          stream->read_longlong (*(CORBA::LongLong *) data);
+                        break;
+                      case CORBA::tk_boolean:
+                        continue_decoding =
+                          stream->read_boolean (*(CORBA::Boolean *) data);
+                        break;
+                      case CORBA::tk_char:
+                      case CORBA::tk_octet:
+                        continue_decoding =
+                          stream->read_char (*(CORBA::Char *) data);
+                        break;
+                      case CORBA::tk_longdouble:
+                        continue_decoding =
+                          stream->read_longdouble (*(CORBA::LongDouble *) data);
+                        break;
+                      case CORBA::tk_wchar:
+                        continue_decoding =
+                          stream->read_wchar (*(CORBA::WChar *) data);
+                        break;
+                      case CORBA::tk_TypeCode:
+                      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:
+                        retval = stream->decode (param, data, 0, env);
+                        break;
+
+                      case CORBA::tk_objref:
+                        {
+                          CORBA_Object_ptr object;
+                          retval = stream->decode (param, &object, 0, env);
+                          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+                              && env.exception () == 0)
+                            {
+                              TAO_Object_Field_T<CORBA_Object>* field =
+                                ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
+                                                      ACE_const_cast (void *, data));
+                              field->_downcast (object, env);
+                            }
+                        }
+                        break;
+
+                      default:
+                        break;
+                      }
+                    data = (char *) data + size;
+                  }
+                else
+                  return CORBA::TypeCode::TRAVERSE_STOP;
               }
+            else
+              return CORBA::TypeCode::TRAVERSE_STOP;
           }
-          break;
-
-        default:
-          break;
-        }
-      data = (char *) data + size;
-    }
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+        else
+          return CORBA::TypeCode::TRAVERSE_STOP;
+      }
+  else
+    return CORBA::TypeCode::TRAVERSE_STOP;
 
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
+  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+      && continue_decoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
       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);
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
 // Encode unions.
@@ -726,11 +743,14 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
                            const void *data,
                            const void *data2,
                            void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   // Context is the CDR stream.
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
 
+  CORBA::TypeCode::traverse_status retval =
+    CORBA::TypeCode::TRAVERSE_CONTINUE;
+
   CORBA::TypeCode_ptr discrim_tc;
   CORBA::TypeCode_ptr member_tc;
   CORBA::Any_ptr member_label;
@@ -744,173 +764,207 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
   TAO_Base_Union *base_union = (TAO_Base_Union *)data;
   void *member_val;
 
-  discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
+  discrim_tc = tc->discriminator_type (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
-  // 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++)
+  if (env.exception () == 0)
     {
-      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
-      CORBA::TypeCode_var type = member_label->type ();
-      switch (type->kind (ACE_TRY_ENV)) // kind() doesn't throw any exception.
+      // decode the discriminator value
+      discrim_val = base_union->_discriminant ();
+      retval = stream->decode (discrim_tc, discrim_val, data2, env);
+      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-        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 ((ACE_Message_Block *)
-                                 member_label->_tao_get_cdr ());
-            (void)stream.decode (discrim_tc, &ul, 0, ACE_TRY_ENV);
-            //@@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-            ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-            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);
-      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-      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_val = base_union->_access (1);
-          // marshal according to the matched typecode
-          if (member_tc->kind () == CORBA::tk_objref)
+          discrim_size_with_pad = tc->TAO_discrim_pad_size (env);
+
+          if (env.exception () == 0)
             {
-              // 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);
+              // 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 (env);
+
+              if (env.exception () == 0)
+                {
+                  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)
+                            {
+                              // 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 ((ACE_Message_Block *)
+                                                         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)
+                                    {
+                                      member_val = base_union->_access (1);
+                                      // marshal according to the matched typecode
+                                      if (member_tc->kind () == 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> *,
+                                                                  member_val);
+                                          CORBA::Object_ptr ptr = field->_upcast ();
+                                          return stream->decode (member_tc, &ptr, data2, env);
+                                        }
+                                      else
+                                        {
+                                          return stream->decode (member_tc, member_val,
+                                                                 data2, 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)
+                        {
+                          member_val = base_union->_access (1);
+                          if (default_tc->kind () == 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> *,
+                                                      member_val);
+                              CORBA::Object_ptr ptr = field->_upcast ();
+                              return stream->decode (default_tc, &ptr, data2, env);
+                            }
+                          else
+                            {
+                              return stream->decode (default_tc, member_val,
+                                                     data2, 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
+                {
+                  env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                  return CORBA::TypeCode::TRAVERSE_STOP;
+                }
             }
           else
             {
-              return stream->decode (member_tc, member_val,
-                                     data2, 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)
-    {
-      member_val = base_union->_access (1);
-      if (default_tc->kind () == 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> *,
-                                  member_val);
-          CORBA::Object_ptr ptr = field->_upcast ();
-          return stream->decode (default_tc, &ptr, data2, ACE_TRY_ENV);
-        }
       else
         {
-          return stream->decode (default_tc, member_val,
-                                 data2, ACE_TRY_ENV);
+          env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+          return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
   else
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+    {
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // decode string
@@ -919,7 +973,7 @@ TAO_Marshal_String::decode (CORBA::TypeCode_ptr,
                             const void *data,
                             const void *,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   CORBA::Boolean continue_decoding = 1;
   // Context is the CDR stream.
@@ -936,15 +990,16 @@ TAO_Marshal_String::decode (CORBA::TypeCode_ptr,
   // but we will accept them when it's clear how to do so.
 
   continue_decoding = stream->read_string (*str_ptr);
-  if (continue_decoding != 1)
+  if (continue_decoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_String::decode 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;
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
 // Decode sequence.
@@ -954,7 +1009,7 @@ TAO_Marshal_Sequence::decode (CORBA::TypeCode_ptr  tc,
                               const void *data,
                               const void *,
                               void *context,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   CORBA::Boolean continue_decoding = 1;
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
@@ -981,182 +1036,190 @@ TAO_Marshal_Sequence::decode (CORBA::TypeCode_ptr  tc,
       if (bounds > 0)
         {
           // 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);
+          tc2 = tc->content_type (env);
 
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-          // The treatment of octet sequences is completely
-          // different.
-          if (tc2->kind_ == CORBA::tk_octet
-              && ACE_BIT_DISABLED (stream->start ()->flags (),
-                                   ACE_Message_Block::DONT_DELETE))
-            {
-              TAO_Unbounded_Sequence<CORBA::Octet>* seq2 =
-                ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, seq);
-              seq2->replace (bounds, stream->start ());
-              seq2->mb ()->wr_ptr (seq2->mb ()->rd_ptr () + bounds);
-              stream->skip_bytes (bounds);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            }
-#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-          // Allocate the buffer using the virtual
-          // _allocate_buffer method, hence the right
-          // constructors are invoked and size for the array
-          // is OK.  The sequence will release it, since its
-          // release_ field is 1.
-          if (seq->maximum_ < bounds)
+          if (env.exception () == 0)
             {
-              seq->_deallocate_buffer ();
-              seq->maximum_ = bounds;
-              seq->release_ = 1;
-              seq->buffer_ = 0;
-              seq->_allocate_buffer (bounds);
-            }
-          // In any case the sequence length is changed.
-          seq->length_ = bounds;
+              size = tc2->size (env);
 
-
-          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:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_short_array
-                ((CORBA::Short *) value, bounds);
-              if (continue_decoding == 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_decoding = continue_decoding &&
-                stream->read_long_array
-                ((CORBA::Long *) value, bounds);
-              if (continue_decoding == 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_decoding = continue_decoding &&
-                stream->read_longlong_array
-                ((CORBA::LongLong *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_boolean:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_octet_array
-                ((CORBA::Octet *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_char:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_char_array
-                ((CORBA::Char *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_octet:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_octet_array
-                ((CORBA::Octet *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_longdouble:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_longdouble_array
-                ((CORBA::LongDouble *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-            case CORBA::tk_wchar:
-              // For primitives, compute the size only once
-              continue_decoding = continue_decoding &&
-                stream->read_wchar_array
-                ((CORBA::WChar *) value, bounds);
-              if (continue_decoding == 1)
-                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-              break;
-
-              // handle all aggregate types here
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-            case CORBA::tk_any:
-            case CORBA::tk_TypeCode:
-            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:
-              // 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 = stream->decode (tc2, value, 0, ACE_TRY_ENV);
-                  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-                  value += size;
-                }
-              // CORBA::release (tc2);
-              return retval;
-
-            case CORBA::tk_objref:
-              {
-                size = sizeof (CORBA_Object_ptr);
-                while (bounds-- &&
-                       retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                  {
-                    CORBA_Object_ptr ptr;
-                    retval = stream->decode (tc2, &ptr, 0,  ACE_TRY_ENV);
-                    ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-                    seq->_downcast (value, ptr, ACE_TRY_ENV);
-                    ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
+                  // The treatment of octet sequences is completely
+                  // different.
+                  if (tc2->kind_ == CORBA::tk_octet
+                      && ACE_BIT_DISABLED (stream->start ()->flags (),
+                                           ACE_Message_Block::DONT_DELETE))
+                    {
+                      TAO_Unbounded_Sequence<CORBA::Octet>* seq2 =
+                        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, seq);
+                      seq2->replace (bounds, stream->start ());
+                      seq2->mb ()->wr_ptr (seq2->mb ()->rd_ptr () + bounds);
+                      stream->skip_bytes (bounds);
+                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                    }
+#endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
 
-                    CORBA::release (ptr);
-                    value += size;
-                  }
-                return retval;
-              }
+                  // Allocate the buffer using the virtual
+                  // _allocate_buffer method, hence the right
+                  // constructors are invoked and size for the array
+                  // is OK.  The sequence will release it, since its
+                  // release_ field is 1.
+                  if (seq->maximum_ < bounds)
+                    {
+                      seq->_deallocate_buffer ();
+                      seq->maximum_ = bounds;
+                      seq->release_ = 1;
+                      seq->buffer_ = 0;
+                      seq->_allocate_buffer (bounds);
+                    }
+                  // In any case the sequence length is changed.
+                  seq->length_ = bounds;
+
+
+                  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:
+                      // For primitives, compute the size only once
+                      continue_decoding = continue_decoding &&
+                        stream->read_short_array
+                        ((CORBA::Short *) value, bounds);
+                      if (continue_decoding == 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_decoding = continue_decoding &&
+                        stream->read_long_array
+                        ((CORBA::Long *) value, bounds);
+                      if (continue_decoding == 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_decoding = continue_decoding &&
+                        stream->read_longlong_array
+                        ((CORBA::LongLong *) value, bounds);
+                      if (continue_decoding == 1)
+                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                      break;
+
+                    case CORBA::tk_boolean:
+                      // For primitives, compute the size only once
+                      continue_decoding = continue_decoding &&
+                        stream->read_octet_array
+                        ((CORBA::Octet *) value, bounds);
+                      if (continue_decoding == 1)
+                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                      break;
+
+                    case CORBA::tk_char:
+                      // For primitives, compute the size only once
+                      continue_decoding = continue_decoding &&
+                        stream->read_char_array
+                        ((CORBA::Char *) value, bounds);
+                      if (continue_decoding == 1)
+                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                      break;
+
+                    case CORBA::tk_octet:
+                      // For primitives, compute the size only once
+                      continue_decoding = continue_decoding &&
+                        stream->read_octet_array
+                        ((CORBA::Octet *) value, bounds);
+                      if (continue_decoding == 1)
+                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                      break;
+
+                    case CORBA::tk_longdouble:
+                      // For primitives, compute the size only once
+                      continue_decoding = continue_decoding &&
+                        stream->read_longdouble_array
+                        ((CORBA::LongDouble *) value, bounds);
+                      if (continue_decoding == 1)
+                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                      break;
+
+                    case CORBA::tk_wchar:
+                      // For primitives, compute the size only once
+                      continue_decoding = continue_decoding &&
+                        stream->read_wchar_array
+                        ((CORBA::WChar *) value, bounds);
+                      if (continue_decoding == 1)
+                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                      break;
+
+                      // handle all aggregate types here
+                    case CORBA::tk_string:
+                    case CORBA::tk_wstring:
+                    case CORBA::tk_any:
+                    case CORBA::tk_TypeCode:
+                    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:
+                      // For those aggregate types whose size is
+                      // constant, we compute it only once.
+                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                        {
+                          retval = stream->decode (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;
+                            retval = stream->decode (tc2, &ptr, 0,  env);
+                            if (env.exception () != 0) break;
+                            seq->_downcast (value, ptr, env);
+                            if (env.exception () != 0) break;
+                            CORBA::release (ptr);
+                            value += size;
+                          }
+                        if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                          return retval;
+                      }
+                      break;
 
-            default:
-              break;
-            } // end of switch
+                    default:
+                      break;
+                    } // end of switch
+                } // no exception computing size
+            } // no exception computing content type
         } // length is > 0
       else
         return CORBA::TypeCode::TRAVERSE_CONTINUE;
     }
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  // 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;
 }
 
 // Decode array.
@@ -1166,7 +1229,7 @@ TAO_Marshal_Array::decode (CORBA::TypeCode_ptr  tc,
                            const void *data,
                            const void *,
                            void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   CORBA::Boolean continue_decoding = 1;
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
@@ -1184,126 +1247,130 @@ TAO_Marshal_Array::decode (CORBA::TypeCode_ptr  tc,
   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
-  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_)
+  bounds = tc->length (env);
+  if (env.exception () == 0)
     {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_short_array
-        ((CORBA::Short *) value, bounds);
-      if (continue_decoding == 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_decoding = continue_decoding &&
-        stream->read_long_array
-        ((CORBA::Long *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
+      // get element typecode
+      tc2 = tc->content_type (env);
+      if (env.exception () == 0)
+        {
+          size = tc2->size (env);
+          if (env.exception () == 0)
+            {
+              switch (tc2->kind_)
+                {
+                case CORBA::tk_null:
+                case CORBA::tk_void:
+                  return CORBA::TypeCode::TRAVERSE_CONTINUE;
+
+                case CORBA::tk_short:
+                case CORBA::tk_ushort:
+                  // For primitives, compute the size only once
+                  continue_decoding = continue_decoding &&
+                    stream->read_short_array
+                    ((CORBA::Short *) value, bounds);
+                  if (continue_decoding == 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_decoding = continue_decoding &&
-        stream->read_longlong_array
-        ((CORBA::LongLong *) value, bounds);
-      if (continue_decoding == 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_decoding = continue_decoding &&
+                    stream->read_long_array
+                    ((CORBA::Long *) value, bounds);
+                  if (continue_decoding == 1)
+                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                  break;
 
-    case CORBA::tk_boolean:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_octet_array
-        ((CORBA::Octet *) value, bounds);
-      if (continue_decoding == 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_decoding = continue_decoding &&
+                    stream->read_longlong_array
+                    ((CORBA::LongLong *) value, bounds);
+                  if (continue_decoding == 1)
+                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                  break;
 
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_octet_array
-        ((CORBA::Octet *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
+                case CORBA::tk_boolean:
+                  // For primitives, compute the size only once
+                  continue_decoding = continue_decoding &&
+                    stream->read_octet_array
+                    ((CORBA::Octet *) value, bounds);
+                  if (continue_decoding == 1)
+                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                  break;
 
-    case CORBA::tk_longdouble:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_longdouble_array
-        ((CORBA::LongDouble *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
+                case CORBA::tk_char:
+                case CORBA::tk_octet:
+                  // For primitives, compute the size only once
+                  continue_decoding = continue_decoding &&
+                    stream->read_octet_array
+                    ((CORBA::Octet *) value, bounds);
+                  if (continue_decoding == 1)
+                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                  break;
 
-    case CORBA::tk_wchar:
-      // For primitives, compute the size only once
-      continue_decoding = continue_decoding &&
-        stream->read_wchar_array
-        ((CORBA::WChar *) value, bounds);
-      if (continue_decoding == 1)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-      break;
+                case CORBA::tk_longdouble:
+                  // For primitives, compute the size only once
+                  continue_decoding = continue_decoding &&
+                    stream->read_longdouble_array
+                    ((CORBA::LongDouble *) value, bounds);
+                  if (continue_decoding == 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->decode (tc2, value, 0, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+                case CORBA::tk_wchar:
+                  // For primitives, compute the size only once
+                  continue_decoding = continue_decoding &&
+                    stream->read_wchar_array
+                    ((CORBA::WChar *) value, bounds);
+                  if (continue_decoding == 1)
+                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                  break;
 
-          value += size;
-        }
-      // CORBA::release (tc2);
-      return retval;
-    default:
-      break;
-    } // end of switch
+                  // 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->decode (tc2, value, 0, env);
+                      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::decode detected error\n"));
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  env.exception (new CORBA::MARSHAL ());
+  return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
 // Decode alias.
@@ -1312,7 +1379,7 @@ TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr  tc,
                            const void *data,
                            const void *,
                            void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_ptr tc2;
@@ -1326,83 +1393,82 @@ TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr  tc,
     CORBA::TypeCode::TRAVERSE_CONTINUE;
   char *value = (char *) data;
 
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-  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_decoding =
-        stream->read_short (*(CORBA::Short *) value);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_decoding =
-        stream->read_long (*(CORBA::Long *) value);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_decoding =
-        stream->read_longlong (*(CORBA::LongLong *) value);
-      break;
-    case CORBA::tk_boolean:
-      continue_decoding =
-        stream->read_boolean (*(CORBA::Boolean *) value);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_decoding =
-        stream->read_char (*(CORBA::Char *) value);
-      break;
-    case CORBA::tk_longdouble:
-      continue_decoding =
-        stream->read_longdouble (*(CORBA::LongDouble *) value);
-      break;
-    case CORBA::tk_wchar:
-      continue_decoding =
-        stream->read_wchar (*(CORBA::WChar *) value);
-      break;
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-    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_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-      retval = stream->decode (tc2, data, 0, ACE_TRY_ENV);
-      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-      break;
-    default:
-      // anything else is an error
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || continue_decoding != 1)
+    // 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_decoding =
+          stream->read_short (*(CORBA::Short *) value);
+        break;
+      case CORBA::tk_long:
+      case CORBA::tk_ulong:
+      case CORBA::tk_float:
+      case CORBA::tk_enum:
+        continue_decoding =
+          stream->read_long (*(CORBA::Long *) value);
+        break;
+      case CORBA::tk_double:
+      case CORBA::tk_longlong:
+      case CORBA::tk_ulonglong:
+        continue_decoding =
+          stream->read_longlong (*(CORBA::LongLong *) value);
+        break;
+      case CORBA::tk_boolean:
+        continue_decoding =
+          stream->read_boolean (*(CORBA::Boolean *) value);
+        break;
+      case CORBA::tk_char:
+      case CORBA::tk_octet:
+        continue_decoding =
+          stream->read_char (*(CORBA::Char *) value);
+        break;
+      case CORBA::tk_longdouble:
+        continue_decoding =
+          stream->read_longdouble (*(CORBA::LongDouble *) value);
+        break;
+      case CORBA::tk_wchar:
+        continue_decoding =
+          stream->read_wchar (*(CORBA::WChar *) value);
+        break;
+      case CORBA::tk_string:
+      case CORBA::tk_wstring:
+      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_sequence:
+      case CORBA::tk_array:
+      case CORBA::tk_alias:
+      case CORBA::tk_except:
+        retval = stream->decode (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_decoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Except::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+                    "TAO_Marshal_Alias::decode detected error\n"));
+      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      return CORBA::TypeCode::TRAVERSE_STOP;
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
 // Decode exception For exceptions, the "hidden" type ID near the
@@ -1417,7 +1483,7 @@ TAO_Marshal_Except::decode (CORBA::TypeCode_ptr  tc,
                             const void *data,
                             const void *,
                             void *context,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
   CORBA::TypeCode::traverse_status retval =
@@ -1433,99 +1499,106 @@ TAO_Marshal_Except::decode (CORBA::TypeCode_ptr  tc,
   // members of the derived class which must be encoded.
 
   // Number of fields in the struct.
-  int 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);
-
-  for (int i = 0; i < member_count
-         && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-         && continue_decoding == 1; i++)
+  int member_count = tc->member_count (env);
+  if (env.exception () == 0)
     {
-      param = 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);
-
-      size = param->size (ACE_TRY_ENV);
-      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      alignment = param->alignment (ACE_TRY_ENV);
-      // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      data = ptr_align_binary (data, alignment);
-      switch (param->kind_)
+      for (int i = 0; i < member_count
+             && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+             && continue_decoding == 1; i++)
         {
-        case CORBA::tk_null:
-        case CORBA::tk_void:
-          break;
-        case CORBA::tk_short:
-        case CORBA::tk_ushort:
-          continue_decoding =
-            stream->read_short (*(CORBA::Short *) data);
-          break;
-        case CORBA::tk_long:
-        case CORBA::tk_ulong:
-        case CORBA::tk_float:
-        case CORBA::tk_enum:
-          continue_decoding =
-            stream->read_long (*(CORBA::Long *) data);
-          break;
-        case CORBA::tk_double:
-        case CORBA::tk_longlong:
-        case CORBA::tk_ulonglong:
-          continue_decoding =
-            stream->read_longlong (*(CORBA::LongLong *) data);
-          break;
-        case CORBA::tk_boolean:
-          continue_decoding =
-            stream->read_boolean (*(CORBA::Boolean *) data);
-          break;
-        case CORBA::tk_char:
-        case CORBA::tk_octet:
-          continue_decoding =
-            stream->read_char (*(CORBA::Char *) data);
-          break;
-        case CORBA::tk_longdouble:
-          continue_decoding =
-            stream->read_longdouble (*(CORBA::LongDouble *) data);
-          break;
-        case CORBA::tk_wchar:
-          continue_decoding =
-            stream->read_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->decode (param, data, 0, ACE_TRY_ENV);
-          // @@EXC@@ Rethrow CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)?
-          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_decoding =
+                            stream->read_short (*(CORBA::Short *) data);
+                          break;
+                        case CORBA::tk_long:
+                        case CORBA::tk_ulong:
+                        case CORBA::tk_float:
+                        case CORBA::tk_enum:
+                          continue_decoding =
+                            stream->read_long (*(CORBA::Long *) data);
+                          break;
+                        case CORBA::tk_double:
+                        case CORBA::tk_longlong:
+                        case CORBA::tk_ulonglong:
+                          continue_decoding =
+                            stream->read_longlong (*(CORBA::LongLong *) data);
+                          break;
+                        case CORBA::tk_boolean:
+                          continue_decoding =
+                            stream->read_boolean (*(CORBA::Boolean *) data);
+                          break;
+                        case CORBA::tk_char:
+                        case CORBA::tk_octet:
+                          continue_decoding =
+                            stream->read_char (*(CORBA::Char *) data);
+                          break;
+                        case CORBA::tk_longdouble:
+                          continue_decoding =
+                            stream->read_longdouble (*(CORBA::LongDouble *) data);
+                          break;
+                        case CORBA::tk_wchar:
+                          continue_decoding =
+                            stream->read_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->decode (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_decoding != 1)
+  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+      && continue_decoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Except::decode 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;
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
 // decode wstring
@@ -1534,7 +1607,7 @@ TAO_Marshal_WString::decode (CORBA::TypeCode_ptr,
                              const void *data,
                              const void *,
                              void *context,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   CORBA::Boolean continue_decoding = 1;
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
@@ -1563,13 +1636,14 @@ TAO_Marshal_WString::decode (CORBA::TypeCode_ptr,
         str++;
       }
 
-  if (continue_decoding != 1)
+  if (continue_decoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_WString::decode 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;
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
index 80de531d5f4..6d647935f40 100644
--- a/TAO/tao/deep_free.cpp
+++ b/TAO/tao/deep_free.cpp
@@ -45,12 +45,10 @@ CORBA::TypeCode::traverse_status
 DEEP_FREE (CORBA::TypeCode_ptr  param,
            const void *source,
            const void *dest,
-           CORBA::Environment &ACE_TRY_ENV)
+           CORBA::Environment &env)
 {
   CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-  // Since every exception-throwing function is followed by break and then return,
-  // we'll just skip the checking here.
   switch (param->kind_)
     {
     case CORBA::tk_null:
@@ -71,44 +69,44 @@ DEEP_FREE (CORBA::TypeCode_ptr  param,
     case CORBA::tk_wchar:
       break;
     case CORBA::tk_any:
-      retval = TAO_Marshal_Any::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Any::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_TypeCode:
-      retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_Principal:
-      retval = TAO_Marshal_Principal::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Principal::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_objref:
-      retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_struct:
-      retval = TAO_Marshal_Struct::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Struct::deep_free (param, source, dest, env);
 
       // @@ It's likely that other types will need their top-level
       // memory freed as well. --- Carlos (and Seth).
       // delete source;
       break;
     case CORBA::tk_union:
-      retval = TAO_Marshal_Union::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Union::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_string:
-      retval = TAO_Marshal_String::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_String::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_sequence:
-      retval = TAO_Marshal_Sequence::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Sequence::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_array:
-      retval = TAO_Marshal_Array::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Array::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_alias:
-      retval = TAO_Marshal_Alias::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Alias::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_except:
-      retval = TAO_Marshal_Except::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Except::deep_free (param, source, dest, env);
       break;
     case CORBA::tk_wstring:
-      retval = TAO_Marshal_WString::deep_free (param, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_WString::deep_free (param, source, dest, env);
       break;
     default:
       retval = CORBA::TypeCode::TRAVERSE_STOP;
@@ -122,7 +120,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  tc,
                                   const void *,
                                   const void *,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   CORBA::TCKind my_kind;
 
@@ -131,11 +129,11 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  tc,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Primitive::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
-  my_kind = tc->kind (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  my_kind = tc->kind (env);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
   switch (my_kind)
     {
@@ -160,8 +158,7 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  tc,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Primitive::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
@@ -171,14 +168,14 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
                                const void *source,
                                const void *dest,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   if (!tc)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Struct::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -186,22 +183,22 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
   CORBA::Long size;
 
   // compute the number of fields in the struct
-  int member_count = tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  int member_count = tc->member_count (env);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0; i < member_count && retval ==
          CORBA::TypeCode::TRAVERSE_CONTINUE; i++)
     {
       // get the typecode for the ith field
-      param = tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      param = tc->member_type (i, env);
+
+      TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
       // get the size of the field
-      size = param->size (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+      size = param->size (env);
+
+      TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
-      // Since every exception-throwing function is followed by a break, we'll just
-      // check for exception after the switch.
       switch (param->kind_)
         {
         case CORBA::tk_null:
@@ -222,13 +219,13 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
         case CORBA::tk_wchar:
           break;
         case CORBA::tk_any:
-          retval = TAO_Marshal_Any::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_Any::deep_free (param, source, dest, env);
           break;
         case CORBA::tk_TypeCode:
-          retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, env);
           break;
         case CORBA::tk_Principal:
-          retval = TAO_Marshal_Principal::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_Principal::deep_free (param, source, dest, env);
           break;
 
         case CORBA::tk_objref:
@@ -242,43 +239,42 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
         break;
 
         case CORBA::tk_struct:
-          retval = TAO_Marshal_Struct::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_Struct::deep_free (param, source, dest, env);
           break;
         case CORBA::tk_union:
-          retval = TAO_Marshal_Union::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_Union::deep_free (param, source, dest, env);
           break;
         case CORBA::tk_string:
-          retval = TAO_Marshal_String::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_String::deep_free (param, source, dest, env);
           break;
         case CORBA::tk_sequence:
-          retval = TAO_Marshal_Sequence::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_Sequence::deep_free (param, source, dest, env);
           break;
         case CORBA::tk_array:
-          retval = TAO_Marshal_Array::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_Array::deep_free (param, source, dest, env);
           break;
         case CORBA::tk_alias:
-          retval = TAO_Marshal_Alias::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_Alias::deep_free (param, source, dest, env);
           break;
         case CORBA::tk_except:
-          retval = TAO_Marshal_Except::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_Except::deep_free (param, source, dest, env);
           break;
         case CORBA::tk_wstring:
-          retval = TAO_Marshal_WString::deep_free (param, source, dest, ACE_TRY_ENV);
+          retval = TAO_Marshal_WString::deep_free (param, source, dest, env);
           break;
         default:
           retval = CORBA::TypeCode::TRAVERSE_STOP;
         } // end of switch
       source = (char *)source + size;
     } // end of loop
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Struct::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
@@ -288,7 +284,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
                               const void *data,
                               const void *data2,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
   CORBA::TypeCode_ptr discrim_tc;
@@ -308,11 +304,11 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
                                      ACE_const_cast (void *, 
                                                      data));
 
-  discrim_tc = tc->discriminator_type (ACE_TRY_ENV);
+  discrim_tc = tc->discriminator_type (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);
+  //  if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
   discrim_val = base_union->_discriminant ();
   // Get a pointer to the discriminator value.
@@ -320,16 +316,16 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
   member_val = base_union->_access (0);
   // Get a pointer to the member, but don't allocate new storage.
 
-  default_index = tc->default_index (ACE_TRY_ENV);
+  default_index = tc->default_index (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);
+  // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
+  TAO_CHECK_ENV_RETURN (env,  CORBA::TypeCode::TRAVERSE_STOP);
 
-  member_count = tc->member_count (ACE_TRY_ENV);
+  member_count = tc->member_count (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 (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
+  TAO_CHECK_ENV_RETURN (env,  CORBA::TypeCode::TRAVERSE_STOP);
 
   // check which label value matches with the discriminator
   // value. Accordingly, marshal the corresponding
@@ -337,14 +333,14 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
   // and marshal accordingly. Otherwise it is an error.
   for (i = 0; member_count-- != 0; i++)
     {
-      member_label = tc->member_label (i, ACE_TRY_ENV);
+      member_label = tc->member_label (i, 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 (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_CHECK_ENV_RETURN (env,  CORBA::TypeCode::TRAVERSE_STOP);
 
       // do the matching
       CORBA::TypeCode_var type = member_label->type ();
-      switch (type->kind (ACE_TRY_ENV))
+      switch (type->kind (env))
         {
         case CORBA::tk_short:
           if (*(CORBA::Short *)member_label->_tao_get_cdr ()->base () ==
@@ -383,15 +379,16 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
             discrim_matched = 1;
           break;
         default:
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 
-                            CORBA::TypeCode::TRAVERSE_STOP);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), 
+                                env, 
+                                CORBA::TypeCode::TRAVERSE_STOP);
         }// end of switch
 
       // get the member typecode
-      member_tc = tc->member_type (i, ACE_TRY_ENV);
+      member_tc = tc->member_type (i, 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 (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_CHECK_ENV_RETURN (env,  CORBA::TypeCode::TRAVERSE_STOP);
 
       if (default_index >= 0 && default_index-- == 0)
         {
@@ -405,20 +402,22 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
           retval = DEEP_FREE (discrim_tc, 
                               discrim_val, 
                               data2, 
-                              ACE_TRY_ENV);
+                              env);
 
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          TAO_CHECK_ENV_RETURN (env, 
+                                CORBA::TypeCode::TRAVERSE_STOP);
 
           if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-            ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 
-                              CORBA::TypeCode::TRAVERSE_STOP);
+            TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 
+                                  env, 
+                                  CORBA::TypeCode::TRAVERSE_STOP);
 
           // marshal according to the matched typecode
-          // @@EXC@@ No need to check ACE_TRY_ENV.
+          // @@EXC@@ No need to check env.
           return DEEP_FREE (member_tc, 
                             member_val,
                             data2, 
-                            ACE_TRY_ENV);
+                            env);
         } // end of if
     } // end of for
 
@@ -428,23 +427,27 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
   retval = DEEP_FREE (discrim_tc, 
                       discrim_val, 
                       data2, 
-                      ACE_TRY_ENV);
+                      env);
 
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  TAO_CHECK_ENV_RETURN (env, 
+                        CORBA::TypeCode::TRAVERSE_STOP);
 
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 
-                      CORBA::TypeCode::TRAVERSE_STOP);
+    TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 
+                          env, 
+                          CORBA::TypeCode::TRAVERSE_STOP);
 
   if (default_tc)
     return DEEP_FREE (default_tc, 
                       member_val, 
                       data2, 
-                      ACE_TRY_ENV);
+                      env);
   else
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
+// @@EXC@@ Exception modification progress. -- Nanbor
+
 // deep_free for Sequence
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Sequence::deep_free (CORBA::TypeCode_ptr  tc,
@@ -472,7 +475,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
                               const void *source,
                               const void *dest,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
@@ -488,22 +491,21 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Struct::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
-  bounds = tc->length (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  bounds = tc->length (env);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
  // exception getting bounds
 
   // get element typecode
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  tc2 = tc->content_type (env);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
   // exception computing content type
 
   // get the size of the element type
-  size = tc2->size (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  size = tc2->size (env);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
   switch (tc2->kind_)
     {
@@ -530,96 +532,96 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
     case CORBA::tk_any:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_Any::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_Any::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_TypeCode:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_Principal:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_objref:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_struct:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_union:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_Union::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_Union::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_string:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_String::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_String::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_sequence:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_array:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_Array::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_Array::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_alias:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_except:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_Except::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_Except::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
     case CORBA::tk_wstring:
       while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          retval = TAO_Marshal_WString::deep_free (tc2, source, dest, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+          retval = TAO_Marshal_WString::deep_free (tc2, source, dest, env);
+          TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
           source = (char *)source + size;
         }
       break;
@@ -628,15 +630,17 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
       break;
     } // end of switch
   //              CORBA::release (tc2);
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
+  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Sequence::deep_free detected error\n"));
       // error exit
-      ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  ACE_NOTREACHED (return CORBA::TypeCode::TRAVERSE_STOP);
 }
 
 // deep_free alias
@@ -644,7 +648,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  tc,
                               const void *source,
                               const void *dest,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   CORBA::TypeCode_ptr   tc2;  // typecode of the aliased type
   CORBA::TypeCode::traverse_status   retval =
@@ -655,13 +659,12 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  tc,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Alias::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   // get element type
-  tc2 = tc->content_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  tc2 = tc->content_type (env);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
   // exception getting content_type
 
   // switch on the data type and handle the cases for primitives here for
@@ -687,58 +690,59 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  tc,
       //              CORBA::release (tc2);
       return CORBA::TypeCode::TRAVERSE_CONTINUE;
     case CORBA::tk_any:
-      retval = TAO_Marshal_Any::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Any::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_TypeCode:
-      retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_Principal:
-      retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_objref:
-      retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_struct:
-      retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_union:
-      retval = TAO_Marshal_Union::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Union::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_string:
-      retval = TAO_Marshal_String::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_String::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_sequence:
-      retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_array:
-      retval = TAO_Marshal_Array::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Array::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_alias:
-      retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_except:
-      retval = TAO_Marshal_Except::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_Except::deep_free (tc2, source, dest, env);
       break;
     case CORBA::tk_wstring:
-      retval = TAO_Marshal_WString::deep_free (tc2, source, dest, ACE_TRY_ENV);
+      retval = TAO_Marshal_WString::deep_free (tc2, source, dest, env);
       break;
     default:
       // anything else is an error
       retval = CORBA::TypeCode::TRAVERSE_STOP;
     }
   //      CORBA::release (tc2);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
+  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
       // We should never reach here.
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Alias::decode detected error\n"));
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  ACE_NOTREACHED (return CORBA::TypeCode::TRAVERSE_STOP);
 }
 
 // deep_free structs
@@ -746,7 +750,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr  tc,
                                const void *,
                                const void *,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
 #if 0
   // temporarily commented out to make compiler happy
@@ -762,8 +766,7 @@ TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr  tc,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "TAO_Marshal_Except::deep_free detected error\n"));
-      ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
     // XXX: Exceptions are currently leaked because of bugs lurking
     // in this area.  Keep in mind that there are two things to
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 022e915d6a5..f45d053efb4 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -55,55 +55,51 @@ 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],
-                              "-ORBIIOPProfileLock") == 0)
+      if (ACE_OS::strcmp (argv[curarg], "-ORBiiopprofilelock") == 0)
         {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "thread") == 0)
+            if (ACE_OS::strcasecmp (name, "thread") == 0)
               this->iiop_profile_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
+            else if (ACE_OS::strcasecmp (name, "null") == 0)
               this->iiop_profile_lock_type_ = TAO_NULL_LOCK;
           }
         }
 
-      else if (ACE_OS::strcasecmp (argv[curarg],
-                                   "-ORBClientConnectionHandler") == 0)
+      else if (ACE_OS::strcmp (argv[curarg], "-ORBclientconnectionhandler") == 0)
         {
           curarg++;
           if (curarg < argc)
             {
               char *name = argv[curarg];
 
-              if (ACE_OS::strcasecmp (name,
-                                      "MT") == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
-              else if (ACE_OS::strcasecmp (name,
-                                           "ST") == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
-              else if (ACE_OS::strcasecmp (name,
-                                           "RW") == 0)
-                this->wait_strategy_ = TAO_WAIT_ON_READ;
+              if (ACE_OS::strcasecmp (name, "MT") == 0)
+                {
+                  this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
+                }
+              else if (ACE_OS::strcasecmp (name, "ST") == 0)
+                {
+                  this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
+                }
+              else if (ACE_OS::strcasecmp (name, "RW") == 0)
+                {
+                  this->wait_strategy_ = TAO_WAIT_ON_READ;
+                }
             }
         }
-      else if (ACE_OS::strcmp (argv[curarg],
-                               "-ORBTransportMuxStrategy") == 0)
+      else if (ACE_OS::strcmp (argv[curarg], "-ORBrequestmuxstrategy") == 0)
         {
           curarg++;
           if (curarg < argc)
             {
               char *name = argv[curarg];
 
-              if (ACE_OS::strcasecmp (name,
-                                      "MUXED") == 0)
+              if (ACE_OS::strcasecmp (name, "MUXED") == 0)
                 this->transport_mux_strategy_ = TAO_MUXED_TMS;
-              else if (ACE_OS::strcasecmp (name,
-                                           "EXCLUSIVE") == 0)
+              else if (ACE_OS::strcasecmp (name, "EXCLUSIVE") == 0)
                 this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
             }
         }
@@ -114,7 +110,7 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
 ACE_Lock *
 TAO_Default_Client_Strategy_Factory::create_iiop_profile_lock (void)
 {
-  ACE_Lock *the_lock = 0;
+  ACE_Lock* the_lock = 0;
 
   if (this->iiop_profile_lock_type_ == TAO_NULL_LOCK)
     ACE_NEW_RETURN (the_lock,
@@ -134,22 +130,24 @@ TAO_Default_Client_Strategy_Factory::create_iiop_profile_lock (void)
 //    -ORBclientconnectionhandler option to implement the WS factory,
 //    but you need new options for the TMS...
 
-// Create the correct client transport muxing strategy.
+// Create the correct client request muxing strategy.
 TAO_Transport_Mux_Strategy *
 TAO_Default_Client_Strategy_Factory::create_transport_mux_strategy (void)
 {
   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,
+                      0);
+    }
+  else
+    {
+      ACE_NEW_RETURN (tms,
+                      TAO_Exclusive_TMS,
+                      0);
+    }
 
   return tms;
 }
@@ -160,17 +158,23 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (TAO_Transport *transp
   TAO_Wait_Strategy *ws = 0;
 
   if (this->wait_strategy_ == TAO_WAIT_ON_READ)
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_On_Read (transport),
-                    0);
+    {
+      ACE_NEW_RETURN (ws,
+                      TAO_Wait_On_Read (transport),
+                      0);
+    }
   else if (this->wait_strategy_ == TAO_WAIT_ON_REACTOR)
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_On_Reactor (transport),
-                    0);
+    {
+      ACE_NEW_RETURN (ws,
+                      TAO_Wait_On_Reactor (transport),
+                      0);
+    }
   else
-    ACE_NEW_RETURN (ws,
-                    TAO_Wait_On_Leader_Follower (transport),
-                    0);
+    {
+      ACE_NEW_RETURN (ws,
+                      TAO_Wait_On_Leader_Follower (transport),
+                      0);
+    }
 
   return ws;
 }
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 05e280d80c9..10d44e7f063 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -15,7 +15,6 @@
 #include "ace/FlReactor.h"
 #include "ace/WFMO_Reactor.h"
 #include "ace/Msg_WFMO_Reactor.h"
-#include "ace/TP_Reactor.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
 
@@ -26,7 +25,8 @@
 ACE_RCSID(tao, default_resource, "$Id$")
 
 TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
-  : use_tss_resources_ (0),
+  : resource_source_ (TAO_GLOBAL),
+    poa_source_ (TAO_GLOBAL),
     reactor_type_ (TAO_REACTOR_SELECT_MT),
     cdr_allocator_source_ (TAO_GLOBAL)
 {
@@ -40,7 +40,9 @@ TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void)
          this->protocol_factories_.begin ();
        iterator != end;
        ++iterator)
-    delete *iterator;
+    {
+      delete *iterator;
+    }
 
   this->protocol_factories_.reset ();
 }
@@ -49,60 +51,83 @@ int
 TAO_Default_Resource_Factory::init (int argc, char **argv)
 {
   ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
+  // This table shows the arguments that are parsed with their valid
+  // combinations.
+  //
+  //   ORB      POA    comments
+  // +-------+-------+-----------------+
+  // | TSS   | TSS   | if ORB==TSS     |
+  // |       |       | then POA=TSS    |
+  // |       |       | as def.value.   |
+  // +-------+-------+-----------------+
+  // | TSS   | GLOBAL| ok.             |
+  // +-------+-------+-----------------+
+  // | GLOBAL| GLOBAL| if ORB==Global  |
+  // |       |       | then POA=Global |
+  // |       |       | as def.value.   |
+  // +-------+-------+-----------------+
+  // | GLOBAL| TSS   | *NOT VALID*     |
+  // +-------+-------+-----------------+
+
+  int local_poa_source      = -1;
+  int local_resource_source = -1;
 
   for (int curarg = 0; curarg < argc; curarg++)
-    if (ACE_OS::strcasecmp (argv[curarg],
-                            "-ORBResources") == 0)
+    if (ACE_OS::strcmp (argv[curarg], "-ORBresources") == 0)
+      {
+        curarg++;
+        if (curarg < argc)
+          {
+            char *name = argv[curarg];
+
+            if (ACE_OS::strcasecmp (name, "global") == 0)
+              local_resource_source = TAO_GLOBAL;
+            else if (ACE_OS::strcasecmp (name, "tss") == 0)
+              local_resource_source = TAO_TSS;
+          }
+      }
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoa") == 0)
       {
-        ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) The -ORBResources option "
-                    "has been moved to the ORB parameters\n"));
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "global") == 0)
-              this->use_tss_resources_ = 0;
-            else if (ACE_OS::strcasecmp (name,
-                                         "tss") == 0)
-              this->use_tss_resources_ = 1;
+            if (ACE_OS::strcasecmp (name, "global") == 0)
+              local_poa_source = TAO_GLOBAL;
+            else if (ACE_OS::strcasecmp (name, "tss") == 0)
+              local_poa_source = TAO_TSS;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBReactorLock") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBreactorlock") == 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Default_Resource obsolete -ORBReactorLock "
-                    "option, please use -ORBReactorType\n"));
+                    "TAO_Default_Resource obsolete -ORBreactorlock "
+                    "option, please use -ORBreactortype\n"));
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name, "null") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_ST;
+              reactor_type_ = TAO_REACTOR_SELECT_MT;
             else if (ACE_OS::strcasecmp (name, "token") == 0)
-              reactor_type_= TAO_REACTOR_SELECT_MT;
+              reactor_type_= TAO_REACTOR_SELECT_ST;
           }
       }
 
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBReactorType") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBreactortype") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "select_mt") == 0)
+            if (ACE_OS::strcasecmp (name, "select_mt") == 0)
               reactor_type_ = TAO_REACTOR_SELECT_MT;
-            else if (ACE_OS::strcasecmp (name,
-                                         "select_st") == 0)
+            else if (ACE_OS::strcasecmp (name, "select_st") == 0)
               reactor_type_ = TAO_REACTOR_SELECT_ST;
-            else if (ACE_OS::strcasecmp (name,
-                                         "fl_reactor") == 0)
+            else if (ACE_OS::strcasecmp (name, "fl_reactor") == 0)
 #if defined(ACE_HAS_FL)
               reactor_type_ = TAO_REACTOR_FL;
 #else
@@ -110,8 +135,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
                           "TAO_Default_Factory - FlReactor"
                           " not supported on this platform\n"));
 #endif /* ACE_HAS_FL */
-            else if (ACE_OS::strcasecmp (name,
-                                         "xt_reactor") == 0)
+            else if (ACE_OS::strcasecmp (name, "xt_reactor") == 0)
 #if defined(ACE_HAS_XT)
               reactor_type_ = TAO_REACTOR_XT;
 #else
@@ -119,8 +143,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
                           "TAO_Default_Factory - XtReactor"
                           " not supported on this platform\n"));
 #endif /* ACE_HAS_XT */
-            else if (ACE_OS::strcasecmp (name,
-                                         "WFMO") == 0)
+            else if (ACE_OS::strcasecmp (name, "WFMO") == 0)
 #if defined(ACE_WIN32)
               reactor_type_ = TAO_REACTOR_WFMO;
 #else
@@ -128,8 +151,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
                           "TAO_Default_Factory - WFMO Reactor"
                           " not supported on this platform\n"));
 #endif /* ACE_WIN32 */
-            else if (ACE_OS::strcasecmp (name,
-                                         "MsgWFMO") == 0)
+            else if (ACE_OS::strcasecmp (name, "MsgWFMO") == 0)
 #if defined(ACE_WIN32)
               reactor_type_ = TAO_REACTOR_MSGWFMO;
 #else
@@ -137,10 +159,6 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
                           "TAO_Default_Factory - MsgWFMO Reactor"
                           " not supported on this platform\n"));
 #endif /* ACE_WIN32 */
-
-            else if (ACE_OS::strcasecmp (name,
-                                         "ThreadPool") == 0)
-              reactor_type_ = TAO_REACTOR_TP;
             else
               ACE_DEBUG ((LM_DEBUG,
                           "TAO_Default_Factory - unknown argument"
@@ -148,40 +166,56 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
           }
       }
 
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBInputCDRAllocator") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBinputcdrallocator") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "global") == 0)
+            if (ACE_OS::strcasecmp (name, "global") == 0)
               this->cdr_allocator_source_ = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name,
-                                         "tss") == 0)
+            else if (ACE_OS::strcasecmp (name, "tss") == 0)
               this->cdr_allocator_source_ = TAO_TSS;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBProtocolFactory") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBprotocolfactory") == 0)
       {
         TAO_ProtocolFactorySet *pset = this->get_protocol_factories ();
         curarg++;
         if (curarg < argc)
           {
-            TAO_Protocol_Item *item;
-            ACE_NEW_RETURN (item,
-                            TAO_Protocol_Item (argv[curarg]),
-                            -1);
+            TAO_Protocol_Item *item = new TAO_Protocol_Item (argv[curarg]);
             if (pset->insert (item) == -1)
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) Unable to add protocol factories for %s: %p\n",
-                          argv[curarg]));
+              {
+                ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) Unable to add protocol factories for %s: %p\n", argv[curarg]));
+              }
           }
       }
 
+  // Don't allow a global ORB and a tss POA.
+  if ( (local_resource_source == TAO_GLOBAL) &&
+       (local_poa_source == TAO_TSS) )
+    return -1;
+
+  // make poa=tss the default, if ORB is tss and the user didn't
+  // specify a value.
+  if ( (local_resource_source == TAO_TSS) &&
+       (local_poa_source      == -1) )
+    local_poa_source = TAO_TSS;
+
+  // update the object data members.
+  if (local_resource_source != -1)
+    this->resource_source_ = local_resource_source;
+  if (local_poa_source != -1)
+    this->poa_source_      = local_poa_source;
+
+  // Don't allow a global ORB and a tss POA.
+  if ( (this->resource_source_ == TAO_GLOBAL) &&
+       (this->poa_source_      == TAO_TSS) )
+    return -1;
+
   return 0;
 }
 
@@ -191,8 +225,8 @@ 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.
+  // @@ Ossama, if you want to be very paranoid, you could get memory leak
+  // if insert operations failed.
 
   if (factory == end)
     {
@@ -278,12 +312,6 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
   return 0;
 }
 
-int
-TAO_Default_Resource_Factory::use_tss_resources (void) const
-{
-  return this->use_tss_resources_;
-}
-
 TAO_ProtocolFactorySet *
 TAO_Default_Resource_Factory::get_protocol_factories (void)
 {
@@ -344,10 +372,6 @@ TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
       ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor, 0);
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE */
       break;
-
-    case TAO_REACTOR_TP:
-      ACE_NEW_RETURN (impl, ACE_TP_Reactor, 0);
-      break;
     }
   return impl;
 }
@@ -355,11 +379,28 @@ TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
 ACE_Reactor *
 TAO_Default_Resource_Factory::get_reactor (void)
 {
-  ACE_Reactor *reactor;
-  ACE_NEW_RETURN (reactor,
-                  ACE_Reactor (this->allocate_reactor_impl ()),
-                  0);
-  return reactor;
+  switch (this->resource_source_)
+    {
+    case TAO_GLOBAL:
+      if (GLOBAL_ALLOCATED::instance ()->r_ == 0)
+        {
+          ACE_NEW_RETURN (GLOBAL_ALLOCATED::instance ()->r_,
+                          ACE_Reactor (this->allocate_reactor_impl (), 1),
+                          0);
+        }
+      return GLOBAL_ALLOCATED::instance ()->r_;
+      ACE_NOTREACHED (break);
+    case TAO_TSS:
+      if (TSS_ALLOCATED::instance ()->r_ == 0)
+        {
+          ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->r_,
+                          ACE_Reactor (this->allocate_reactor_impl (), 1),
+                          0);
+        }
+      return TSS_ALLOCATED::instance ()->r_;
+      ACE_NOTREACHED (break);
+    }
+  return 0;
 }
 
 typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> TSS_MALLOC;
@@ -423,19 +464,28 @@ TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void)
 ACE_Allocator*
 TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void)
 {
-  ACE_Allocator *allocator;
-  ACE_NEW_RETURN (allocator, TSS_ALLOCATOR, 0);
-  return allocator;
+  if (TSS_ALLOCATED::instance ()->output_cdr_dblock_allocator_ == 0)
+    {
+      ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->output_cdr_dblock_allocator_,
+                      TSS_ALLOCATOR,
+                      0);
+    }
+  return TSS_ALLOCATED::instance ()->output_cdr_dblock_allocator_;
 }
 
 ACE_Allocator *
 TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
 {
-  ACE_Allocator *allocator;
-  ACE_NEW_RETURN (allocator, TSS_ALLOCATOR, 0);
-  return allocator;
+  if (TSS_ALLOCATED::instance ()->output_cdr_buffer_allocator_ == 0)
+    {
+      ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->output_cdr_buffer_allocator_,
+                      TSS_ALLOCATOR,
+                      0);
+    }
+  return TSS_ALLOCATED::instance ()->output_cdr_buffer_allocator_;
 }
 
+
 ACE_Data_Block*
 TAO_Default_Resource_Factory::create_input_cdr_data_block (size_t size)
 {
@@ -497,13 +547,21 @@ TAO_Default_Resource_Factory::create_input_cdr_data_block (size_t size)
 // ****************************************************************
 
 TAO_Allocated_Resources::TAO_Allocated_Resources (void)
-  : input_cdr_dblock_allocator_ (0),
-    input_cdr_buffer_allocator_ (0)
+  : r_ (0),
+    input_cdr_dblock_allocator_ (0),
+    input_cdr_buffer_allocator_ (0),
+    output_cdr_dblock_allocator_ (0),
+    output_cdr_buffer_allocator_ (0)
 {
 }
 
 TAO_Allocated_Resources::~TAO_Allocated_Resources (void)
 {
+  // The destruction of the Reactor must come before the destruction
+  // of the allocators.  The handlers deleted when the Reactors die
+  // access these allocators.
+  delete this->r_;
+
   if (this->input_cdr_dblock_allocator_ != 0)
     this->input_cdr_dblock_allocator_->remove ();
   delete this->input_cdr_dblock_allocator_;
@@ -511,6 +569,14 @@ TAO_Allocated_Resources::~TAO_Allocated_Resources (void)
   if (this->input_cdr_buffer_allocator_ != 0)
     this->input_cdr_buffer_allocator_->remove ();
   delete this->input_cdr_buffer_allocator_;
+
+  if (this->output_cdr_dblock_allocator_ != 0)
+    this->output_cdr_dblock_allocator_->remove ();
+  delete this->output_cdr_dblock_allocator_;
+
+  if (this->output_cdr_buffer_allocator_ != 0)
+    this->output_cdr_buffer_allocator_->remove ();
+  delete this->output_cdr_buffer_allocator_;
 }
 
 // ****************************************************************
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 2236c3569de..3a61df09826 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -24,6 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/POA.h"
 #include "ace/Singleton.h"
 #include "ace/Service_Config.h"
 
@@ -51,9 +52,16 @@ public:
 
   // = Resources
 
+  ACE_Reactor *r_;
+  // The Reactor.
+
   ACE_Allocator *input_cdr_dblock_allocator_;
   ACE_Allocator *input_cdr_buffer_allocator_;
   // The allocators for the input CDR streams.
+
+  ACE_Allocator *output_cdr_dblock_allocator_;
+  ACE_Allocator *output_cdr_buffer_allocator_;
+  // The allocators for the output CDR streams.
 };
 
 // ****************************************************************
@@ -99,15 +107,24 @@ public:
     TAO_REACTOR_FL,
     TAO_REACTOR_XT,
     TAO_REACTOR_WFMO,
-    TAO_REACTOR_MSGWFMO,
-    TAO_REACTOR_TP
+    TAO_REACTOR_MSGWFMO
   };
 
+  // = Range of values for <{resource source specifier}>.
+  virtual void resource_source (int which_source);
+  // Set the resource source specifier.
+  virtual int resource_source (void);
+  // Get the resource source specifier.
+
+  virtual void poa_source (int which_source);
+  // Set the POA source specifier.
+  virtual int poa_source (void);
+  // Get the POA source specifier.
+
   int cdr_allocator_source (void);
   // Modify and get the source for the CDR allocators
 
   // = Resource Retrieval
-  virtual int use_tss_resources (void) const;
   virtual ACE_Reactor *get_reactor (void);
   virtual TAO_Acceptor_Registry  *get_acceptor_registry (void);
   virtual TAO_Connector_Registry *get_connector_registry (void);
@@ -125,10 +142,16 @@ protected:
   // Obtain the reactor implementation
 
 protected:
-  int use_tss_resources_;
+
+  int resource_source_;
   // Flag indicating whether resources should be global or
   // thread-specific.
 
+  int poa_source_;
+  // Flag indicating whether the POA should be global or
+  // thread-specific.  If not set specifically, this takes on the
+  // value of <resource_source_>.
+
   int reactor_type_;
   // Flag indicating which kind of reactor we should use.
 
diff --git a/TAO/tao/default_resource.i b/TAO/tao/default_resource.i
index 74e88caa0c5..1567935345f 100644
--- a/TAO/tao/default_resource.i
+++ b/TAO/tao/default_resource.i
@@ -1,2 +1,25 @@
 // $Id$
 
+ACE_INLINE void
+TAO_Default_Resource_Factory::resource_source (int which_source)
+{
+  resource_source_ = which_source;
+}
+
+ACE_INLINE int
+TAO_Default_Resource_Factory::resource_source (void)
+{
+  return resource_source_;
+}
+
+ACE_INLINE void
+TAO_Default_Resource_Factory::poa_source (int which_source)
+{
+  poa_source_ = which_source;
+}
+
+ACE_INLINE int
+TAO_Default_Resource_Factory::poa_source (void)
+{
+  return poa_source_;
+}
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index cfe7d69302b..78117acf68e 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -13,6 +13,7 @@ TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
   : activate_server_connections_ (0),
     thread_flags_ (THR_BOUND),
     poa_lock_type_ (TAO_THREAD_LOCK),
+    poa_mgr_lock_type_ (TAO_THREAD_LOCK),
     event_loop_lock_type_ (TAO_NULL_LOCK),
     cached_connector_lock_type_ (TAO_THREAD_LOCK)
 {
@@ -55,17 +56,36 @@ TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void)
 }
 
 ACE_Lock *
+TAO_Default_Server_Strategy_Factory::create_servant_lock (void)
+{
+  ACE_Lock *the_lock = 0;
+
+#if defined (ACE_HAS_THREADS)
+  if (this->activate_server_connections ())
+      ACE_NEW_RETURN (the_lock,
+                      ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> (),
+                      0);
+  else
+#endif /* ACE_HAS_THREADS */
+      ACE_NEW_RETURN (the_lock,
+                      ACE_Lock_Adapter<ACE_Null_Mutex> (),
+                      0);
+
+  return the_lock;
+}
+
+ACE_Lock *
 TAO_Default_Server_Strategy_Factory::create_event_loop_lock (void)
 {
   ACE_Lock *the_lock = 0;
 
   if (this->event_loop_lock_type_ == TAO_NULL_LOCK)
     ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
+                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
                     0);
   else
     ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX>,
+                    ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> (),
                     0);
 
   return the_lock;
@@ -78,11 +98,11 @@ TAO_Default_Server_Strategy_Factory::create_cached_connector_lock (void)
 
   if (this->cached_connector_lock_type_ == TAO_NULL_LOCK)
     ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>,
+                    ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
                     0);
   else
     ACE_NEW_RETURN (the_lock,
-                    ACE_Lock_Adapter<ACE_SYNCH_MUTEX>,
+                    ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (),
                     0);
 
   return the_lock;
@@ -90,9 +110,7 @@ TAO_Default_Server_Strategy_Factory::create_cached_connector_lock (void)
 
 // Evil macros b/c I'm lazy!
 #define TAO_BEGINCHECK  if (0)
-#define TAO_CHECKANDSET(sym) \
-  else if (ACE_OS::strcmp (flag, #sym) == 0) \
-  ACE_SET_BITS (this->thread_flags_, sym)
+#define TAO_CHECKANDSET(sym) else if (ACE_OS::strcmp (flag, #sym) == 0) ACE_SET_BITS (this->thread_flags_, sym)
 #define TAO_ENDCHECK
 
 void
@@ -100,13 +118,9 @@ TAO_Default_Server_Strategy_Factory::tokenize (char *flag_string)
 {
   char *lasts = 0;
 
-  for (char *flag = ACE_OS::strtok_r (flag_string,
-                                      "|",
-                                      &lasts);
+  for (char *flag = ACE_OS::strtok_r (flag_string, "|", &lasts);
        flag != 0;
-       flag = ACE_OS::strtok_r (0,
-                                "|",
-                                &lasts))
+       flag = ACE_OS::strtok_r (0, "|", &lasts))
     {
       TAO_BEGINCHECK;
       TAO_CHECKANDSET (THR_DETACHED);
@@ -127,7 +141,7 @@ TAO_Default_Server_Strategy_Factory::init (int argc, char *argv[])
 }
 
 int
-TAO_Default_Server_Strategy_Factory::open (TAO_ORB_Core *orb_core)
+TAO_Default_Server_Strategy_Factory::open (TAO_ORB_Core* orb_core)
 {
   return 0;
 }
@@ -140,238 +154,180 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
   int curarg;
 
   for (curarg = 0; curarg < argc && argv[curarg]; curarg++)
-    if (ACE_OS::strcasecmp (argv[curarg],
-                            "-ORBConcurrency") == 0)
+    if (ACE_OS::strcmp (argv[curarg], "-ORBconcurrency") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "reactive") == 0)
+            if (ACE_OS::strcasecmp (name, "reactive") == 0)
               this->activate_server_connections_ = 0;
-            else if (ACE_OS::strcasecmp (name,
-                                         "thread-per-connection") == 0)
+            else if (ACE_OS::strcasecmp (name, "thread-per-connection") == 0)
               this->activate_server_connections_ = 1;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBTableSize") == 0
-             || ACE_OS::strcasecmp (argv[curarg],
-                                    "-ORBActiveObjectMapSize") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBtablesize") == 0 ||
+             ACE_OS::strcmp (argv[curarg], "-ORBactiveobjectmapsize") == 0)
       {
         curarg++;
         if (curarg < argc)
-          this->active_object_map_creation_parameters_.active_object_map_size_ =
-            ACE_OS::strtoul (argv[curarg],
-                             0,
-                             10);
+          this->active_object_map_creation_parameters_.active_object_map_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBPOAMapSize") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoamapsize") == 0)
       {
         curarg++;
         if (curarg < argc)
-          this->active_object_map_creation_parameters_.poa_map_size_ =
-            ACE_OS::strtoul (argv[curarg],
-                             0,
-                             10);
+          this->active_object_map_creation_parameters_.poa_map_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBActiveHintInIds") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBactivehintinids") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *value = argv[curarg];
 
-            this->active_object_map_creation_parameters_.use_active_hint_in_ids_ =
-              ACE_OS::atoi (value);
+            this->active_object_map_creation_parameters_.use_active_hint_in_ids_ = ACE_OS::atoi (value);
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBActiveHintInPOANames") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBactivehintinpoanames") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *value = argv[curarg];
 
-            this->active_object_map_creation_parameters_.use_active_hint_in_poa_names_ =
-              ACE_OS::atoi (value);
+            this->active_object_map_creation_parameters_.use_active_hint_in_poa_names_ = ACE_OS::atoi (value);
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBAllowReactivationOfSystemids") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBallowreactivationofsystemids") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *value = argv[curarg];
 
-            this->active_object_map_creation_parameters_.allow_reactivation_of_system_ids_ =
-              ACE_OS::atoi (value);
+            this->active_object_map_creation_parameters_.allow_reactivation_of_system_ids_ = ACE_OS::atoi (value);
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBUseridPolicyDemuxStrategy") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBuseridpolicydemuxstrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            // Active demux not supported with user id policy.
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ =
-                TAO_LINEAR;
+            // Active demux not supported with user id policy
+            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ = TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name, "linear") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ = TAO_LINEAR;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBSystemidPolicyDemuxStrategy") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBsystemidpolicydemuxstrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
-                TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name,
-                                         "active") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ =
-                TAO_ACTIVE_DEMUX;
+            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name, "linear") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_LINEAR;
+            else if (ACE_OS::strcasecmp (name, "active") == 0)
+              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_ACTIVE_DEMUX;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBPersistentidPolicyDemuxStrategy") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBpersistentidpolicydemuxstrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            // Active demux not supported with user id policy.
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ =
-                TAO_LINEAR;
+            // Active demux not supported with user id policy
+            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ = TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name, "linear") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ = TAO_LINEAR;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBTransientidPolicyDemuxStrategy") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBtransientidpolicydemuxstrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
-                TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name,
-                                         "active") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ =
-                TAO_ACTIVE_DEMUX;
+            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name, "linear") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_LINEAR;
+            else if (ACE_OS::strcasecmp (name, "active") == 0)
+              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_ACTIVE_DEMUX;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBUniqueidPolicyReverseDemuxStrategy") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBuniqueidpolicyreversedemuxstrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "dynamic") == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
-                TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name,
-                                         "linear") == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ =
-                TAO_LINEAR;
+            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
+              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name, "linear") == 0)
+              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_LINEAR;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBDemuxStrategy") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBdemuxstrategy") == 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    "Warning: -ORBDemuxStrategy is deprecated.  Please use "
-                    "-ORBSystemidPolicyDemuxStrategy or -ORBUseridPolicyDemuxStrategy instead.\n"));
+                    "Warning: -ORBdemuxstrategy is deprecated.  Please use "
+                    "-ORBsystemidpolicydemuxstrategy or -ORBuseridpolicydemuxstrategy instead.\n"));
         curarg++;
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBPOALock") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoalock") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "thread") == 0)
+            if (ACE_OS::strcasecmp (name, "thread") == 0)
               this->poa_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
+            else if (ACE_OS::strcasecmp (name, "null") == 0)
               this->poa_lock_type_ = TAO_NULL_LOCK;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBEventLoopLock") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBeventlock") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "thread") == 0)
-              this->event_loop_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
-              this->event_loop_lock_type_ = TAO_NULL_LOCK;
+            if (ACE_OS::strcasecmp (name, "thread") == 0)
+              this->poa_mgr_lock_type_ = TAO_THREAD_LOCK;
+            else if (ACE_OS::strcasecmp (name, "null") == 0)
+              this->poa_mgr_lock_type_ = TAO_NULL_LOCK;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBConnectorLock") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBconnectorlock") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "thread") == 0)
+            if (ACE_OS::strcasecmp (name, "thread") == 0)
               this->cached_connector_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
+            else if (ACE_OS::strcasecmp (name, "null") == 0)
               this->cached_connector_lock_type_ = TAO_NULL_LOCK;
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBThreadFlags") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBthreadflags") == 0)
       {
         curarg++;
 
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 84e6f39b74d..57efe4afb4b 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -46,6 +46,20 @@ public:
   virtual int server_connection_thread_flags (void);
   virtual int server_connection_thread_count (void);
 
+  virtual ACE_Lock *create_servant_lock (void);
+  // The servant lock is based on the setting of POA, and concurrency
+  // strategy as follows:
+  // 1. If concurrency policy is reactive and POA is TSS
+  //    then return ACE_Null_Mutex via ACE_Lock_Adapter.
+  //
+  // 2. If concurrency policy is non-reactive then
+  //    return ACE_Thread_Mutex ...
+  //
+  // 3. If the POA is global then, return
+  //    ACE_Null_Mutex iff ORB_init count == 1,
+  //    else if ORB_init count > 1 return
+  //    ACE_Thread_Mutex.
+
   virtual ACE_Lock *create_event_loop_lock (void);
   // If the ORB is single threaded or some form of ORB-per-thread then
   // it is more efficient to use a Null_Mutex for the variables
@@ -79,6 +93,9 @@ protected:
   Lock_Type poa_lock_type_;
   // The type of lock to be returned by <create_poa_lock()>.
 
+  Lock_Type poa_mgr_lock_type_;
+  // The type of lock to be returned by <create_poa_mgr_lock()>.
+
   Lock_Type event_loop_lock_type_;
   // The type of lock to be returned by <create_event_loop_lock()>.
 
diff --git a/TAO/tao/iopfwd.h b/TAO/tao/iopfwd.h
new file mode 100644
index 00000000000..61ab19abf41
--- /dev/null
+++ b/TAO/tao/iopfwd.h
@@ -0,0 +1,42 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//   TAO
+//
+// = FILENAME
+//   iopfwd.h
+//
+// = DESCRIPTION
+//   Forward declare the types in the IOP namespace.
+//
+// = AUTHOR
+//   Carlos O'Ryan
+//
+// ============================================================================
+
+#ifndef TAO_IOPFWD_H
+#define TAO_IOPFWD_H
+
+#include "tao/corbafwd.h"
+
+class TAO_Export IOP
+{
+  // = TITLE
+  //   Provides the IOP namespace.
+  //
+  // = DESCRIPTION
+public:
+  typedef CORBA::ULong ComponentId;
+  typedef CORBA::ULong_out ComponentId_out;
+  // static CORBA::TypeCode_ptr _tc_ComponentId;
+
+  typedef CORBA::ULong ServiceId;
+  typedef CORBA::ULong_out ServiceId_out;
+  // static CORBA::TypeCode_ptr _tc_ServiceId;
+
+  // @@ Add more types....
+};
+
+#endif /* TAO_IOPFWD_H */
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 3cd7751ac7d..40472ed3709 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -172,12 +172,6 @@
 #define TAO_NAMESPACE_DEFINE(TYPE,NAME,RHS) NAME = RHS;
 #endif /* ACE_HAS_USING_KEYWORD */
 
-# if defined (_MSC_VER) && defined (__ACE_INLINE__)
-#   define TAO_NAMESPACE_INLINE_FUNCTION inline
-# else
-#   define TAO_NAMESPACE_INLINE_FUNCTION TAO_NAMESPACE_STORAGE_CLASS
-# endif
-
 // Instead of replacing this with the ACE macro
 // in 20+ files, define it conditionally.
 // The TAO_OutputCDR class uses the ACE macro, which
@@ -242,6 +236,16 @@
 #  pragma warning (disable:4355) /* disable C4355 warning */
 #endif /* defined (_WIN32) */
 
+#if !defined (TAO_CONST)
+// Something to document the fact that we want to put 'const' in front
+// of a type, but that it won't turn out the way we want, e.g., we
+// really want to express that a CORBA_String is const, but since
+// CORBA_String is a char*, the const modifies the pointer and not the
+// pointed-to, and some compilers (like SGI's EDG-derived thang)
+// complain.
+#define TAO_CONST
+#endif /* TAO_CONST */
+
 // The IDL compiler can generate the classes corresponding to IDL
 // sequences in two ways:
 // + Use the TAO templates for sequences,
@@ -281,19 +285,6 @@
 #define TAO_OBJID_POLICYMANAGER    "ORBPolicyManager"
 #define TAO_OBJID_POLICYCURRENT    "PolicyCurrent"
 
-// TAO Naming Service.
-
-// Poa id of the root Naming Context in a Naming server.
-#if !defined (TAO_ROOT_NAMING_CONTEXT)
-#  define TAO_ROOT_NAMING_CONTEXT "NameService"
-#endif /* ! TAO_ROOT_NAMING_CONTEXT */
-
-// The name under which the index of naming contexts is stored in
-// persistent naming service.
-#if !defined (TAO_NAMING_CONTEXT_INDEX)
-#  define TAO_NAMING_CONTEXT_INDEX "Naming_Context_Index"
-#endif /* ! TAO_NAMING_CONTEXT_INDEX */
-
 // The Root POA default name.
 #define TAO_DEFAULT_ROOTPOA_NAME   ""
 
@@ -303,49 +294,37 @@
 // Minimum CORBA
 // #define TAO_HAS_MINIMUM_CORBA
 
-// Without Minimum CORBA, the user will get regular (no locality
-// constraints) policies by default.  With Minimum CORBA, the user
-// will get locality constraint policies by default.
-//
-// If #define TAO_HAS_REMOTE_POLICIES 0, then the user will always get
-// locality constraint policies (regardless of Minimum CORBA).
-//
-// If #define TAO_HAS_REMOTE_POLICIES 1, then the user will always get
-// regular policies (regardless of Minimum CORBA).
-
-// TAO_HAS_LOCALITY_CONSTRAINT_POLICIES is an internal macro and
-// should not be set by the user.
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-# undef TAO_HAS_LOCALITY_CONSTRAINT_POLICIES
-# warning TAO_HAS_LOCALITY_CONSTRAINT_POLICIES is an internal macro \
-and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead.
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-#if defined (TAO_HAS_MINIMUM_CORBA)
-
 // With minimum CORBA, we don't have the ForwardRequest exception.
 // Therefore, we can't support the INS forwarding agent.
+#if defined (TAO_HAS_MINIMUM_CORBA)
 # if !defined (TAO_NO_IOR_TABLE)
 #  define TAO_NO_IOR_TABLE
 # endif /* TAO_NO_IOR_TABLE */
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
-# if !defined (TAO_HAS_REMOTE_POLICIES)
-#  define TAO_HAS_REMOTE_POLICIES 0
-# endif /* TAO_HAS_REMOTE_POLICIES */
+// CORBA Messaging
+#define TAO_HAS_CORBA_MESSAGING
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+// The maximum value for an standard PolicyType, we use this trick to
+// pack the standard policies and the TAO extension in a single
+// array.
+// The motivation for such a low-level optimization is that policies
+// can be set on a per-object level, allocating a complex data
+// structure (such as a hash map) or a big array for each object is
+// not feasible.
+#define TAO_MAX_STANDARD_POLICIES 64
 
-// Policies are not locality constraint by default.
-#if !defined (TAO_HAS_REMOTE_POLICIES)
-# define TAO_HAS_REMOTE_POLICIES 1
-#endif /* TAO_HAS_REMOTE_POLICIES */
+// The number of TAO specific policies
+#define TAO_POLICIES_COUNT 32
 
-#if (TAO_HAS_REMOTE_POLICIES == 0)
-# define TAO_HAS_LOCALITY_CONSTRAINT_POLICIES
-#endif /* TAO_HAS_REMOTE_POLICIES */
+// The size of the Policy array, the number of policies supported in
+// TAO is limited by this number.
+#define TAO_MAX_POLICIES (TAO_MAX_STANDARD_POLICIES+TAO_POLICIES_COUNT)
 
-// CORBA Messaging
-#define TAO_HAS_CORBA_MESSAGING
+// TAO may define its own policies, they are defined in a range far
+// from the standard policies.
+#define TAO_MIN_PROPIETARY_POLICY 1024
+#define TAO_MAX_PROPIETARY_POLICY (TAO_MIN_PROPIETARY_POLICY+TAO_POLICIES_COUNT)
 
 // Define the policy types as literals, so they can be used in switch
 // statements
@@ -363,20 +342,4 @@ and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead.
 #define TAO_MESSAGING_MAX_HOPS_POLICY_TYPE 34
 #define TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE 35
 
-// Control the default version of GIOP used by TAO.
-// The ORB is always able to communicate with 1.0 and 1.1 servers, and
-// 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)
-#define TAO_DEF_GIOP_MAJOR 1
-#endif /* TAO_DEF_GIOP_MAJOR */
-#if !defined(TAO_DEF_GIOP_MINOR)
-#define TAO_DEF_GIOP_MINOR 1
-#endif /* TAO_DEF_GIOP_MINOR */
-
-// By default TAO generate the OMG standard profile components
-// (ORB_TYPE and CODE_SETS)
-#define TAO_STD_PROFILE_COMPONENTS
-
 #endif  /* TAO_ORB_CONFIG_H */
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index 5e9430f885e..12c7edb3d3b 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -17,9 +17,7 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
     sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
     sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
     cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF),
-    use_lite_protocol_ (0),
-    use_dotted_decimal_addresses_ (0),
-    std_profile_components_ (1)
+    use_lite_protocol_ (0)
 {
 }
 
@@ -111,7 +109,7 @@ TAO_ORB_Parameters::parse_endpoints (ACE_CString &endpoints,
 }
 
 
-/* Note ACE_Node<ACE_CString>, ACE_Unbounded_Set<ACE_CString> and
- * ACE_Unbounded_Set_Iterator<ACE_CString> * are instantiated in
+/* Note ACE_Node<ACE_CString>, ACE_Unbounded_Set<ACE_CString> and 
+ * ACE_Unbounded_Set_Iterator<ACE_CString> * are instantiated in 
  * Service_Config.cpp so we do not explicitly instantiate here.
  */
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index fdbc8aa0b9e..8accb03709b 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -136,11 +136,6 @@ public:
   void default_init_ref (const ACE_CString &default_init_ref);
   // Set/Get the Init Reference of an arbitrary ObjectID.
 
-  int std_profile_components (void) const;
-  void std_profile_components (int x);
-  // Disable the OMG standard profile components, useful for
-  // homogenous environments.
-
 private:
   // Each "endpoint" is of the form:
   //
@@ -216,9 +211,6 @@ private:
 
   int use_dotted_decimal_addresses_;
   // For selecting a address notation
-
-  int std_profile_components_;
-  // If true then the standard OMG components are not generated.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 63e924d000f..7603b1b8e5a 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -193,16 +193,3 @@ TAO_ORB_Parameters::default_init_ref (void) const
 {
   return this->default_init_ref_.rep ();
 }
-
-ACE_INLINE int
-TAO_ORB_Parameters::std_profile_components (void) const
-{
-  return this->std_profile_components_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::std_profile_components (int x)
-{
-  this->std_profile_components_ = x;
-}
-
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index a3bf07a3c71..b6dca5d281c 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -289,6 +289,17 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
         if ( (continue_skipping = stream->read_ulong (tag)) == 0)
           continue;
 
+        if (tag != TAO_IOP_TAG_INTERNET_IOP)
+          {
+            continue_skipping = stream->skip_string ();
+            continue;
+          }
+
+        // OK, we've got an IIOP profile.  It's going to be
+        // encapsulated ProfileData.  Create a new decoding stream and
+        // context for it, and tell the "parent" stream that this data
+        // isn't part of it any more.
+
         CORBA::ULong encap_len;
         // ProfileData is encoded as a sequence of octet. So first get
         // the length of the sequence.
@@ -297,7 +308,42 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
         if ( (continue_skipping = stream->read_ulong (encap_len)) == 0)
           continue;
 
-        continue_skipping = stream->skip_bytes (encap_len);
+        TAO_InputCDR str (*stream, encap_len);
+
+        continue_skipping =
+          str.good_bit ()
+          && stream->skip_bytes (encap_len);
+
+        if (!continue_skipping)
+          continue;
+
+        // Read and verify major, minor versions, ignoring IIOP
+        // profiles whose versions we don't understand.
+        //
+        // XXX this doesn't actually go back and skip the whole
+        // encapsulation...
+        if (!(str.skip_octet ()
+              && str.skip_octet ()))
+          continue;
+
+        // skip host and port
+        if (!str.skip_string ()
+            || !str.skip_ushort ())
+          {
+            if (TAO_debug_level > 0)
+              ACE_DEBUG ((LM_DEBUG,
+                          "error decoding IIOP host/port"));
+            env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+            return CORBA::TypeCode::TRAVERSE_STOP;
+          }
+
+        // ... and object key.
+        if (str.skip (TC_opaque,
+                      env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
+          {
+            env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+            return CORBA::TypeCode::TRAVERSE_STOP;
+          }
       }
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile
index 0fffa598c4f..a6dbbb02277 100644
--- a/TAO/tests/CDR/Makefile
+++ b/TAO/tests/CDR/Makefile
@@ -215,7 +215,18 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -235,25 +246,14 @@ 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 \
- $(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/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 \
@@ -269,8 +269,7 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -309,7 +308,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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 \
@@ -467,7 +465,18 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -487,25 +496,14 @@ 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 \
- $(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/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 \
@@ -521,8 +519,7 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -561,7 +558,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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 \
@@ -723,7 +719,18 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -743,25 +750,14 @@ 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 \
- $(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/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 \
@@ -777,8 +773,7 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -817,7 +812,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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 \
@@ -975,7 +969,18 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -995,25 +1000,14 @@ 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 \
- $(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/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 \
@@ -1029,8 +1023,7 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1069,7 +1062,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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 \
@@ -1231,7 +1223,18 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1251,25 +1254,14 @@ 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 \
- $(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/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 \
@@ -1285,8 +1277,7 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1325,7 +1316,6 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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 \
diff --git a/TAO/tests/DynAny_Test/Makefile b/TAO/tests/DynAny_Test/Makefile
index 130e91bad0d..15084a89bd2 100644
--- a/TAO/tests/DynAny_Test/Makefile
+++ b/TAO/tests/DynAny_Test/Makefile
@@ -212,7 +212,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -232,25 +243,14 @@ 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/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/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 \
@@ -266,8 +266,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -306,7 +305,6 @@ realclean:	clean
  $(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 \
@@ -466,7 +464,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -486,25 +495,14 @@ 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/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/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 \
@@ -520,8 +518,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -560,7 +557,6 @@ realclean:	clean
  $(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 \
@@ -719,7 +715,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -739,25 +746,14 @@ 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/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/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 \
@@ -773,8 +769,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -813,7 +808,6 @@ realclean:	clean
  $(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 \
@@ -974,7 +968,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -994,25 +999,14 @@ 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/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/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 \
@@ -1028,8 +1022,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1068,7 +1061,6 @@ realclean:	clean
  $(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 \
@@ -1228,7 +1220,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1248,25 +1251,14 @@ 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/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/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 \
@@ -1282,8 +1274,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1322,7 +1313,6 @@ realclean:	clean
  $(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 \
@@ -1481,7 +1471,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1501,25 +1502,14 @@ 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/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/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 \
@@ -1535,8 +1525,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1575,7 +1564,6 @@ realclean:	clean
  $(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 \
@@ -1734,7 +1722,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1754,25 +1753,14 @@ 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/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/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 \
@@ -1788,8 +1776,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1828,7 +1815,6 @@ realclean:	clean
  $(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 \
@@ -1987,7 +1973,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2007,25 +2004,14 @@ 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/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/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 \
@@ -2041,8 +2027,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2081,7 +2066,6 @@ realclean:	clean
  $(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 \
@@ -2240,7 +2224,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2260,25 +2255,14 @@ 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/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/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 \
@@ -2294,8 +2278,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2334,7 +2317,6 @@ realclean:	clean
  $(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 \
@@ -2493,7 +2475,18 @@ realclean:	clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2513,25 +2506,14 @@ 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/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/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 \
@@ -2547,8 +2529,7 @@ realclean:	clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2587,7 +2568,6 @@ realclean:	clean
  $(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 \
diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h
index f8059a691af..b87a373932d 100644
--- a/TAO/tests/DynAny_Test/data.h
+++ b/TAO/tests/DynAny_Test/data.h
@@ -41,7 +41,7 @@ public:
   CORBA::Any            m_any1,       m_any2;
   CORBA::Object_var     m_objref1,    m_objref2;
 
-const char* labels[16];
+char* labels[16];
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl
index 7f7f19cbbca..ae22a39216a 100755
--- a/TAO/tests/DynAny_Test/run_test.pl
+++ b/TAO/tests/DynAny_Test/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib "../../../bin";
 require ACEutils;
-require Process;
 
 $type = "";
 
@@ -15,14 +14,7 @@ sub run_test
 {
   my $type = shift(@_);
 
-  $BT = Process::Create ($EXEPREFIX."basic_test".$Process::EXE_EXT,
-			 " -t $type");
-
-  $test = $BT->TimedWait (10);
-  if ($test == -1) {
-    print STDERR "ERROR: test timedout\n";
-    $BT->Kill (); $BT->TimedWait (1);
-  }
+  system ($EXEPREFIX."basic_test -t $type");
 
 }
 
@@ -52,8 +44,6 @@ for ($i = 0; $i <= $#ARGV; $i++)
 @types = ("dynany", "dynarray", "dynenum", "dynsequence", "dynstruct",
           "dynunion");
 
-
-
 if ($type ne "")
 {
   run_test ($type);
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index d09fa7796c7..b1ef3877b2d 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -71,12 +71,12 @@ Test_DynEnum::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: value_as_string\n"));
 
-      de1->value_as_string ("TE_FIRST",
+      de1->value_as_string ("FIRST",
                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
       CORBA::String_var s = de1->value_as_string (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (!ACE_OS::strcmp (s.in (), "TE_FIRST"))
+      if (!ACE_OS::strcmp (s.in (), "FIRST"))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else 
diff --git a/TAO/tests/DynAny_Test/test_wrapper.cpp b/TAO/tests/DynAny_Test/test_wrapper.cpp
index ee804a53393..617a6363f72 100644
--- a/TAO/tests/DynAny_Test/test_wrapper.cpp
+++ b/TAO/tests/DynAny_Test/test_wrapper.cpp
@@ -20,7 +20,6 @@
 #define TEST_WRAPPER_CPP
 
 #include "test_wrapper.h"
-#include "ace/OS.h"
 
 // Constructor
 template <class T>
diff --git a/TAO/tests/FL_Cube/Makefile b/TAO/tests/FL_Cube/Makefile
index 20ae088cdc7..b2db90c2b01 100644
--- a/TAO/tests/FL_Cube/Makefile
+++ b/TAO/tests/FL_Cube/Makefile
@@ -204,7 +204,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -224,25 +235,14 @@ 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/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/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 \
@@ -258,8 +258,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -298,7 +297,6 @@ realclean: clean
  $(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 \
@@ -459,7 +457,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -479,25 +488,14 @@ 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/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/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 \
@@ -513,8 +511,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -553,7 +550,6 @@ realclean: clean
  $(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 \
@@ -565,7 +561,7 @@ 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 \
  $(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 \
@@ -714,7 +710,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -734,25 +741,14 @@ 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/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/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 \
@@ -768,8 +764,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -808,7 +803,6 @@ realclean: clean
  $(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 \
@@ -967,7 +961,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -987,25 +992,14 @@ 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/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/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 \
@@ -1021,8 +1015,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1061,7 +1054,6 @@ realclean: clean
  $(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 \
@@ -1220,7 +1212,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1240,25 +1243,14 @@ 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/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/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 \
@@ -1274,8 +1266,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1314,7 +1305,6 @@ realclean: clean
  $(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 \
@@ -1326,6 +1316,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/FL_Cube/svc.conf b/TAO/tests/FL_Cube/svc.conf
index 37133810cc8..192ca875c45 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_reactor"
+static Resource_Factory "-ORBreactortype fl_reactor"
diff --git a/TAO/tests/InterOp-Naming/Makefile b/TAO/tests/InterOp-Naming/Makefile
index b947a9338e6..19f0192f819 100644
--- a/TAO/tests/InterOp-Naming/Makefile
+++ b/TAO/tests/InterOp-Naming/Makefile
@@ -243,7 +243,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -263,25 +274,14 @@ 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/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/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 \
@@ -297,8 +297,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -337,7 +336,6 @@ realclean: clean
  $(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 \
@@ -498,7 +496,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -518,25 +527,14 @@ 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/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/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 \
@@ -552,8 +550,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -592,7 +589,6 @@ realclean: clean
  $(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 \
@@ -755,7 +751,16 @@ realclean: clean
  $(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 \
@@ -777,21 +782,12 @@ realclean: clean
  $(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/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 \
@@ -807,8 +803,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -847,7 +842,6 @@ realclean: clean
  $(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 \
@@ -1036,7 +1030,16 @@ realclean: clean
  $(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 \
@@ -1058,21 +1061,12 @@ realclean: clean
  $(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/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 \
@@ -1088,8 +1082,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1128,7 +1121,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/tests/MT_Client/Makefile b/TAO/tests/MT_Client/Makefile
index ebe8667b8a6..9ad02413652 100644
--- a/TAO/tests/MT_Client/Makefile
+++ b/TAO/tests/MT_Client/Makefile
@@ -247,7 +247,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -267,25 +278,14 @@ 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/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/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 \
@@ -301,8 +301,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -320,7 +319,6 @@ realclean: clean
  $(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 \
@@ -482,7 +480,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -502,25 +511,14 @@ 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/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/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 \
@@ -536,8 +534,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -576,7 +573,6 @@ realclean: clean
  $(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 \
@@ -770,7 +766,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -790,25 +797,14 @@ 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/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/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 \
@@ -824,8 +820,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -843,7 +838,6 @@ realclean: clean
  $(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 \
@@ -1037,7 +1031,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1057,25 +1062,14 @@ 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/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/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 \
@@ -1091,8 +1085,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1110,7 +1103,6 @@ realclean: clean
  $(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 \
@@ -1269,7 +1261,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1289,25 +1292,14 @@ 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/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/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 \
@@ -1323,8 +1315,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1363,7 +1354,6 @@ realclean: clean
  $(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 \
@@ -1522,7 +1512,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1542,25 +1543,14 @@ 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/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/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 \
@@ -1576,8 +1566,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1616,7 +1605,6 @@ realclean: clean
  $(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 \
@@ -1775,7 +1763,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1795,25 +1794,14 @@ 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/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/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 \
@@ -1829,8 +1817,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1869,7 +1856,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/tests/MT_Client/client.conf b/TAO/tests/MT_Client/client.conf
index 5276fe68900..4811e32e352 100644
--- a/TAO/tests/MT_Client/client.conf
+++ b/TAO/tests/MT_Client/client.conf
@@ -1,2 +1,2 @@
-
+static Resource_Factory "-ORBresources global"
 static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl
index 5adff0ff273..659f8671712 100755
--- a/TAO/tests/MT_Client/run_test.pl
+++ b/TAO/tests/MT_Client/run_test.pl
@@ -29,34 +29,15 @@ $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT ",
                        " -ORBsvcconf server.conf  -ORBdebuglevel $debug_level"
                        . " -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_process$Process::EXE_EXT ",
-		       " -ORBsvcconf $client_conf "
-		       . "-ORBdebuglevel $debug_level"
-		       . " -k file://$iorfile "
-		       . " -n $threads -i 1000");
+ACE::waitforfile ($iorfile);
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
+$status  = system ($EXEPREFIX."$client_process$Process::EXE_EXT "
+                   . " -ORBsvcconf $client_conf -ORBdebuglevel $debug_level"
+                   . " -k file://$iorfile "
+                   . " -n $threads -i 1000");
 
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
-if ($server != 0 || $client != 0) {
-  exit 1;
-}
-
-exit 0;
+exit $status;
diff --git a/TAO/tests/MT_Client/test.idl b/TAO/tests/MT_Client/test.idl
index 821dce7a628..3b80a16e3c6 100644
--- a/TAO/tests/MT_Client/test.idl
+++ b/TAO/tests/MT_Client/test.idl
@@ -8,5 +8,5 @@ interface Simple_Server
 
   long get_number ();
 
-  oneway void shutdown ();
+  void shutdown ();
 };
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index 6076a25954a..90782ea5deb 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -11,7 +11,6 @@ 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,
@@ -20,7 +19,6 @@ Simple_Server_i::test_method (CORBA::Environment&)
 
 CORBA::Long
 Simple_Server_i::get_number (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -30,7 +28,6 @@ Simple_Server_i::get_number (CORBA::Environment&)
 
 void
 Simple_Server_i::shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h
index 337f9705e07..1507ff1a10b 100644
--- a/TAO/tests/MT_Client/test_i.h
+++ b/TAO/tests/MT_Client/test_i.h
@@ -31,14 +31,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void test_method (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void test_method (CORBA::Environment&);
 
-  CORBA::Long get_number (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  CORBA::Long get_number (CORBA::Environment&);
 
-  void shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (CORBA::Environment&);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Multiple_Inheritance/Makefile b/TAO/tests/Multiple_Inheritance/Makefile
index 611fadc2215..12e7a4efcb5 100644
--- a/TAO/tests/Multiple_Inheritance/Makefile
+++ b/TAO/tests/Multiple_Inheritance/Makefile
@@ -202,7 +202,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -222,25 +233,14 @@ 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/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/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 \
@@ -256,8 +256,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -296,7 +295,6 @@ realclean: clean
  $(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 \
@@ -458,7 +456,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -478,25 +487,14 @@ 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/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/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 \
@@ -512,8 +510,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -552,7 +549,6 @@ realclean: clean
  $(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 \
@@ -717,7 +713,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -737,25 +744,14 @@ 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/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/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 \
@@ -771,8 +767,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -811,7 +806,6 @@ realclean: clean
  $(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 \
@@ -978,7 +972,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -998,25 +1003,14 @@ 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/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/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 \
@@ -1032,8 +1026,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1072,7 +1065,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index dcdcd2eb342..f91911e61c2 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -8,22 +8,18 @@ class Multiple_Inheritance_i : public POA_D
 {
 public:
   virtual CORBA::String method1 (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method1");
     }
   virtual CORBA::String method2 (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method2");
     }
   virtual CORBA::String method3 (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method3");
     }
   virtual CORBA::String method4 (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method4");
     }
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
index abd189164d2..3a9c39cc188 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
@@ -39,7 +39,6 @@ CORBA::Long
 MT_Object_i::yadda (CORBA::Long hop_count,
                        MT_Object_ptr partner,
                        CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) MT_Object_i::yadda () hop count = %d\n",
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index 2421abb2dea..d9b643a66ef 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -37,8 +37,7 @@ public:
 
   virtual CORBA::Long yadda (CORBA::Long hop_count,
                              MT_Object_ptr partner,
-                             CORBA::Environment &_tao_environment)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                             CORBA::Environment &_tao_environment);
 
 };
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
index 3b6ece10c5c..a8f4e4242c1 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
@@ -213,7 +213,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -233,25 +244,14 @@ 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/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/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 \
@@ -267,8 +267,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -307,7 +306,6 @@ realclean: clean
  $(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 \
@@ -468,7 +466,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -488,25 +497,14 @@ 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/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/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 \
@@ -522,8 +520,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -562,7 +559,6 @@ realclean: clean
  $(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 \
@@ -728,7 +724,16 @@ realclean: clean
  $(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 \
@@ -750,21 +755,12 @@ realclean: clean
  $(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/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 \
@@ -780,8 +776,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -820,7 +815,6 @@ realclean: clean
  $(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 \
@@ -1017,7 +1011,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1037,25 +1042,14 @@ 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/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/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 \
@@ -1071,8 +1065,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1090,7 +1083,6 @@ realclean: clean
  $(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 \
@@ -1255,7 +1247,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1275,25 +1278,14 @@ 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/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/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 \
@@ -1309,8 +1301,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1349,7 +1340,6 @@ realclean: clean
  $(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 \
@@ -1523,7 +1513,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1543,25 +1544,14 @@ 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/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/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 \
@@ -1577,8 +1567,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1617,7 +1606,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
index 2427256e390..be258ea8950 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
@@ -2,4 +2,4 @@
 #
 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() 
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -systemidpolicydemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index 2b4d0df9654..b0ddfdec286 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -72,12 +72,12 @@ private:
   int shutdown_;
   // Flag to tell server to shutdown.
 
-  CORBA::ORB_var orb_var_;
-  // Remember our orb.
-
   MT_Object_var mT_Object_var_;
   // pointer to the mt Object
 
+  CORBA::ORB_var orb_var_;
+  // Remember our orb.
+
   int client_number_;
   // This is used to choose the server...
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
index 4b3ca7cc204..77ec0121e15 100755
--- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
@@ -19,49 +19,21 @@ unlink $ior2file;
 $SV1 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
                         " -o $ior1file ");
 
-if (ACE::waitforfile_timed ($ior1file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ior1file>\n";
-    $SV1->Kill (); $SV1->TimedWait (1);
-    exit 1;
-}
-
 $SV2 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
                         " -o $ior2file ");
 
-if (ACE::waitforfile_timed ($ior2file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ior1file>\n";
-    $SV2->Kill (); $SV2->TimedWait (1);
-    exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."client".$Process::EXE_EXT,
-                       " -f $ior1file -g $ior2file -n 2 -i 10 -s 5");
+ACE::waitforfile ($ior1file);
+ACE::waitforfile ($ior2file);
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-    print STDERR "ERROR: client timedout\n";
-    $CL->Kill (); $CL->TimedWait (1);
-}
+$status = system ($EXEPREFIX."client".$Process::EXE_EXT.
+                  " -f $ior1file -g $ior2file -n 2 -i 10 -s 5");
 
-$SV1->Terminate (); $server1 = $SV1->TimedWait (5);
-if ($server1 == -1) {
-    print STDERR "ERROR: cannot terminate server1\n";
-    $SV1->Kill (); $SV1->TimedWait (1);
-    $SV2->Kill (); $SV2->TimedWait (1);
-}
+$SV1->Kill (); $SV1->Wait ();
+$SV2->Kill (); $SV2->Wait ();
 
-$SV2->Terminate (); $server1 = $SV2->TimedWait (5);
-if ($server2 == -1) {
-    print STDERR "ERROR: cannot terminate server2\n";
-    $SV2->Kill (); $SV2->TimedWait (1);
-}
-
-# Clean up
+#clean up
 unlink $ior1file;
 unlink $ior2file;
 
-if ($client == -1 || $server1 == -1 || $server2 == -1) {
-    exit 1;
-}
-
-exit 0;
+# @@ Capture any errors from the server too.
+exit $status;
diff --git a/TAO/tests/NestedUpcall/Reactor/Makefile b/TAO/tests/NestedUpcall/Reactor/Makefile
index f429df2de7d..f09a2ed4696 100644
--- a/TAO/tests/NestedUpcall/Reactor/Makefile
+++ b/TAO/tests/NestedUpcall/Reactor/Makefile
@@ -216,7 +216,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -236,25 +247,14 @@ 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/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/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 \
@@ -270,8 +270,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -310,7 +309,6 @@ realclean: clean
  $(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 \
@@ -470,7 +468,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -490,25 +499,14 @@ 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/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/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 \
@@ -524,8 +522,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -564,7 +561,6 @@ realclean: clean
  $(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 \
@@ -725,7 +721,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -745,25 +752,14 @@ 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/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/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 \
@@ -779,8 +775,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -819,7 +814,6 @@ realclean: clean
  $(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 \
@@ -983,7 +977,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1003,25 +1008,14 @@ 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/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/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 \
@@ -1037,8 +1031,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1077,7 +1070,6 @@ realclean: clean
  $(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 \
@@ -1270,7 +1262,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1290,25 +1293,14 @@ 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/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/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 \
@@ -1324,8 +1316,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1343,7 +1334,6 @@ realclean: clean
  $(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 \
@@ -1507,7 +1497,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1527,25 +1528,14 @@ 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/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/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 \
@@ -1561,8 +1551,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1601,7 +1590,6 @@ realclean: clean
  $(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 \
@@ -1767,7 +1755,16 @@ realclean: clean
  $(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 \
@@ -1789,21 +1786,12 @@ realclean: clean
  $(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/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 \
@@ -1819,8 +1807,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1859,7 +1846,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/tests/NestedUpcall/Reactor/Reactor.idl b/TAO/tests/NestedUpcall/Reactor/Reactor.idl
index 0ed94064d08..ae70a317d8b 100644
--- a/TAO/tests/NestedUpcall/Reactor/Reactor.idl
+++ b/TAO/tests/NestedUpcall/Reactor/Reactor.idl
@@ -46,7 +46,7 @@ interface Reactor
   // Decrements <num> by invoking the <decrement> operation on <eh>
   // and returning that value, finally stopping when it gets to zero.
 
-  oneway void stop ();
+  void stop ();
   // Stops the reactor.
 };
 
diff --git a/TAO/tests/NestedUpcall/Reactor/client.h b/TAO/tests/NestedUpcall/Reactor/client.h
index c0d92fdb348..bc4123e44ac 100644
--- a/TAO/tests/NestedUpcall/Reactor/client.h
+++ b/TAO/tests/NestedUpcall/Reactor/client.h
@@ -68,15 +68,15 @@ private:
   int shutdown_;
   // Flag to tell server to shutdown.
 
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
   Reactor_var reactor_;
   // reactor pointer for NestedUpCalls.
 
   CORBA::Environment env_;
   // Environment variable.
 
+  CORBA::ORB_var orb_;
+  // Remember our orb.
+
   u_int call_count_;
   // # of calls made to functions.
 
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
index 809325eb7d1..edc59e21080 100644
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
@@ -18,7 +18,6 @@ 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;
@@ -32,9 +31,8 @@ EventHandler_i::peer (CORBA::Environment &)
 
 CORBA::UShort
 EventHandler_i::decrement (Reactor_ptr eh,
-                           CORBA::UShort num,
-                           CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+                      CORBA::UShort num,
+                      CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) EventHandler::decrement (%d)%$", num));
 
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.h b/TAO/tests/NestedUpcall/Reactor/eh_i.h
index b73247c9135..c3b0a729696 100644
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/eh_i.h
@@ -17,15 +17,13 @@ public:
   virtual ~EventHandler_i (void);
   // Destructor.
 
-  virtual CORBA::Long peer (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CORBA::Long peer (CORBA::Environment &env);
   // 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
+                                   CORBA::Environment &env);
+  // deccrement <num> by calling decrement thru <eh> until zero is
   // reached, then return.
 };
 
diff --git a/TAO/tests/NestedUpcall/Reactor/mt_client.h b/TAO/tests/NestedUpcall/Reactor/mt_client.h
index 15f0345917f..a42eeed78e3 100644
--- a/TAO/tests/NestedUpcall/Reactor/mt_client.h
+++ b/TAO/tests/NestedUpcall/Reactor/mt_client.h
@@ -68,11 +68,11 @@ private:
   int nthreads_;
   // # of threads
 
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
   Reactor_var reactor_;
   // reactor pointer for NestedUpCalls.
+
+  CORBA::ORB_var orb_;
+  // Remember our orb.
 };
 
 #endif /* TAO_NUC_MT_CLIENT_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp b/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
index 94bf5b09d5b..fd1e86f26a1 100644
--- a/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
+++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
@@ -19,7 +19,6 @@ Reactor_i::~Reactor_i (void)
 CORBA::Long
 Reactor_i::register_handler (EventHandler_ptr eh,
                              CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Reactor_i::register_handler ()\n"));
@@ -48,7 +47,6 @@ Reactor_i::register_handler (EventHandler_ptr eh,
 
 void
 Reactor_i::set_value (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) doing Reactor_i::set_value()\n"));
@@ -58,7 +56,6 @@ CORBA::UShort
 Reactor_i::decrement (EventHandler_ptr eh,
                       CORBA::UShort num,
                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) Reactor::decrement (%d)%$", num));
 
@@ -77,9 +74,7 @@ Reactor_i::decrement (EventHandler_ptr eh,
 
 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
index 97e6759cf3c..bc7b11c391a 100644
--- a/TAO/tests/NestedUpcall/Reactor/reactor_i.h
+++ b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
@@ -18,22 +18,18 @@ public:
   // Destructor.
 
   virtual CORBA::Long register_handler(EventHandler_ptr eh,
-                                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                       CORBA::Environment &env);
   // Register (with nothing...it's an example!)
 
-  virtual void set_value (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void set_value (CORBA::Environment &env);
 
   virtual CORBA::UShort decrement (EventHandler_ptr eh,
                                    CORBA::UShort num,
-                                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // deccrement <num> by calling decrement thru <eh> until zero is
   // reached, then return.
 
-  virtual void stop (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void stop (CORBA::Environment &env);
   // Stops the reactor.
 };
 
diff --git a/TAO/tests/NestedUpcall/Reactor/run_test.pl b/TAO/tests/NestedUpcall/Reactor/run_test.pl
index 64186b47432..5a9ef6a7b97 100755
--- a/TAO/tests/NestedUpcall/Reactor/run_test.pl
+++ b/TAO/tests/NestedUpcall/Reactor/run_test.pl
@@ -10,71 +10,26 @@ require Process;
 require ACEutils;
 
 $file="test.ior";
-$mtfile="mttest.ior";
-
-print STDERR "\n\n==== Single-threaded test\n";
 
 $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
                        "-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".$Process::EXE_EXT,
-		       " -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;
-}
+ACE::waitforfile ($file);
 
-unlink $file;
+$status  = system ($EXEPREFIX."client".$Process::EXE_EXT.
+                   "-x -k file://$file");
 
-print STDERR "\n\n==== Multi-threaded test\n";
-
-print STDERR "Grace period, waiting for the system to stabilize....";
-sleep 5;
+$SV->Wait ();
 
 $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
-                       " -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".$Process::EXE_EXT,
-		       " -x -k file://$mtfile -ORBsvcconf svc.mt.conf");
-
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-  print STDERR "ERROR: client timedout\n";
-  $CL->Kill (); $CL->TimedWait (1);
-}
+                       "-o $file");
 
-$server = $SV->TimedWait (5);
-if ($server == -1) {
-  print STDERR "ERROR: server timedout\n";
-  $SV->Kill (); $SV->TimedWait (1);
-}
+ACE::waitforfile ($file);
 
-unlink $mtfile;
+$status  = system ($EXEPREFIX."mt_client".$Process::EXE_EXT.
+                   "-x -k file://$file -ORBsvcconf svc.mt.conf");
 
-if ($client == -1 || $server == -1) {
-  exit 1;
-}
+$SV->Wait ();
 
-exit 0;
+# @@ Capture any errors from the server too.
+exit $status;
diff --git a/TAO/tests/NestedUpcall/Reactor/svc.conf b/TAO/tests/NestedUpcall/Reactor/svc.conf
index 40e55e3e868..61618bf5694 100644
--- a/TAO/tests/NestedUpcall/Reactor/svc.conf
+++ b/TAO/tests/NestedUpcall/Reactor/svc.conf
@@ -3,4 +3,4 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Client_Strategy_Factory "-ORBClientConnectionHandler ST"
+static Client_Strategy_Factory "-ORBclientconnectionhandler ST"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index 3b3d4502647..013bb060b3f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -35,9 +35,10 @@ Initiator_i::~Initiator_i (void)
 {
 }
 
+
+
 void
 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"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
index cd7cace945f..197b491070f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
@@ -35,8 +35,7 @@ public:
   virtual ~Initiator_i (void);
   // Destructor.
 
-  virtual void foo_object_B (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void foo_object_B (CORBA::Environment &env);
 
 private:
   Object_A_var object_A_var_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
index 833aac14690..8b5df601a64 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
@@ -222,7 +222,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -242,25 +253,14 @@ 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/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/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 \
@@ -276,8 +276,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -316,7 +315,6 @@ realclean: clean
  $(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 \
@@ -476,7 +474,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -496,25 +505,14 @@ 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/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/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 \
@@ -530,8 +528,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -570,7 +567,6 @@ realclean: clean
  $(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 \
@@ -736,7 +732,16 @@ realclean: clean
  $(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 \
@@ -758,21 +763,12 @@ realclean: clean
  $(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/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 \
@@ -788,8 +784,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -828,7 +823,6 @@ realclean: clean
  $(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 \
@@ -994,7 +988,16 @@ realclean: clean
  $(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 \
@@ -1016,21 +1019,12 @@ realclean: clean
  $(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/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 \
@@ -1046,8 +1040,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1086,7 +1079,6 @@ realclean: clean
  $(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 \
@@ -1246,7 +1238,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1266,25 +1269,14 @@ 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/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/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 \
@@ -1300,8 +1292,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1340,7 +1331,6 @@ realclean: clean
  $(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 \
@@ -1501,7 +1491,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1521,25 +1522,14 @@ 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/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/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 \
@@ -1555,8 +1545,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1595,7 +1584,6 @@ realclean: clean
  $(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 \
@@ -1756,7 +1744,18 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1776,25 +1775,14 @@ 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/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/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 \
@@ -1810,8 +1798,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1850,7 +1837,6 @@ realclean: clean
  $(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 \
@@ -2020,7 +2006,16 @@ realclean: clean
  $(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 \
@@ -2042,21 +2037,12 @@ realclean: clean
  $(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/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 \
@@ -2072,8 +2058,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2112,7 +2097,6 @@ realclean: clean
  $(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 \
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index 7cd0173625f..8328093e02a 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -24,7 +24,7 @@ ACE_RCSID(Triangle_Test, Object_A_i, "$Id$")
 
 // CTOR
 Object_A_i::Object_A_i (void)
-  : finish_two_way_call_ (0)
+: finish_two_way_call_ (0)
 {
 }
 
@@ -38,7 +38,6 @@ Object_A_i::~Object_A_i (void)
 void
 Object_A_i::foo (Initiator_ptr initiator_ptr,
                     CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Object_A_i::foo ()\n"));
@@ -63,7 +62,6 @@ Object_A_i::foo (Initiator_ptr initiator_ptr,
 
 void
 Object_A_i::finish (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Object_A_i::finish ()\n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index 31695b5c779..3f41df62c63 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -35,11 +35,9 @@ public:
   // Destructor.
 
   virtual void foo (Initiator_ptr initiator_ptr,
-                    CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Environment &env);
 
-  virtual void finish (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void finish (CORBA::Environment &env);
 
   unsigned long finish_two_way_call_;
 };
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 6384013e7c6..7405b816092 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -36,8 +36,7 @@ Object_B_i::~Object_B_i (void)
 
 void
 Object_B_i::foo (Object_A_ptr object_A_ptr,
-                 CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+                    CORBA::Environment &)
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) BEGIN Object_B_i::foo ()\n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index 6cb4bc173a9..01366ff476e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -35,8 +35,7 @@ public:
   // Destructor.
 
   virtual void foo(Object_A_ptr object_A_ptr,
-                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   CORBA::Environment &env);
 };
 
 #endif /* OBJECT_B_IMPL_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
index 77cb5613288..424638f1951 100755
--- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
@@ -19,48 +19,21 @@ unlink $ior2file;
 $SV1 = Process::Create ($EXEPREFIX."server_A".$Process::EXE_EXT,
                         "-o $ior1file");
 
-if (ACE::waitforfile_timed ($ior1file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ior1file>\n";
-    $SV1->Kill (); $SV1->TimedWait (1);
-    exit 1;
-}
-
 $SV2 = Process::Create ($EXEPREFIX."server_B".$Process::EXE_EXT,
                         "-o $ior2file");
 
-if (ACE::waitforfile_timed ($ior2file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ior1file>\n";
-    $SV2->Kill (); $SV2->TimedWait (1);
-    exit 1;
-}
-
-$CL = Process::Create ($EXEPREFIX."initiator".$Process::EXE_EXT,
-                       " -f $ior1file -g $ior2file");
+ACE::waitforfile ($ior1file);
+ACE::waitforfile ($ior2file);
 
-$client = $CL->TimedWait (60);
-if ($client == -1) {
-    print STDERR "ERROR: client timedout\n";
-    $CL->Kill (); $CL->TimedWait (1);
-}
+$status = system ($EXEPREFIX."initiator".$Process::EXE_EXT.
+                  " -f $ior1file -g $ior2file");
 
-$SV1->Terminate (); $server1 = $SV1->TimedWait (5);
-if ($server1 == -1) {
-    print STDERR "ERROR: cannot terminate server1\n";
-    $SV1->Kill (); $SV1->TimedWait (1);
-}
-
-$SV2->Terminate (); $server1 = $SV2->TimedWait (5);
-if ($server2 == -1) {
-    print STDERR "ERROR: cannot terminate server2\n";
-    $SV2->Kill (); $SV2->TimedWait (1);
-}
+$SV1->Kill (); $SV1->Wait ();
+$SV2->Kill (); $SV2->Wait ();
 
 # Clean up
 unlink $ior1file;
 unlink $ior2file;
 
-if ($client == -1 || $server1 == -1 || $server2 == -1) {
-    exit 1;
-}
-
-exit 0;
+# @@ Capture any errors from the server too.
+exit $status;
diff --git a/TAO/tests/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile
index 1e59f961bbc..00cf5c08f14 100644
--- a/TAO/tests/OctetSeq/Makefile
+++ b/TAO/tests/OctetSeq/Makefile
@@ -12,17 +12,20 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO
+LDLIBS     =  -lTAO
+LDFLAGS += -L$(TAO_ROOT)/tao
 
-IDLFILES = testC testS
-BIN = OctetSeq client server
+IDL_HDR	= testC.h testS.h
+IDL_SRC	= testC.cpp testS.cpp
 
-SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
+PROG_SRCS = \
+	OctetSeq.cpp \
+
+LSRC = $(PROG_SRCS) $(IDL_SRC)
 
-CLIENT_OBJS = client.o testC.o
-SERVER_OBJS = server.o test_i.o testC.o testS.o
 OCTETSEQ_OBJS = testC.o testS.o OctetSeq.o
 
+BIN = OctetSeq
 BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
@@ -36,26 +39,18 @@ 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
-
-#----------------------------------------------------------------------------
-#       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)
+CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
 OctetSeq: $(addprefix $(VDIR),$(OCTETSEQ_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+.PRECIOUS: $(IDL_HDR) $(IDL_SRC)
+
 realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))))
+	-$(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.
@@ -210,31 +205,8 @@ realclean: clean
  $(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 \
@@ -245,228 +217,6 @@ realclean: clean
  $(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.h testC.i
-.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 \
- 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/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 \
@@ -486,25 +236,14 @@ 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/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/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 \
@@ -520,8 +259,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -560,7 +298,6 @@ realclean: clean
  $(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 \
@@ -572,10 +309,9 @@ realclean: clean
  $(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 \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.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 \
  $(ACE_ROOT)/ace/streams.h \
@@ -585,12 +321,10 @@ 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 \
@@ -722,31 +456,8 @@ realclean: clean
  $(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 \
@@ -757,225 +468,6 @@ realclean: clean
  $(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/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 \
@@ -995,25 +487,14 @@ 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/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/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 \
@@ -1029,8 +510,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1069,7 +549,6 @@ realclean: clean
  $(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 \
@@ -1081,7 +560,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 \
@@ -1228,31 +707,8 @@ realclean: clean
  $(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 \
@@ -1263,225 +719,6 @@ realclean: clean
  $(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/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 \
@@ -1501,25 +738,14 @@ 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/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/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 \
@@ -1535,8 +761,7 @@ realclean: clean
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1575,7 +800,6 @@ realclean: clean
  $(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 \
@@ -1587,6 +811,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 test_i.i
+ testC.i testS_T.h testS_T.i testS_T.cpp testS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index baf7a2cd319..040ca92a929 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -29,69 +29,87 @@ ACE_RCSID(OctetSeq, OctetSeq, "$Id$")
 
 static int
 test_write_octet (TAO_OutputCDR &cdr,
-                  char* buf, size_t bufsize)
+                  char* buf, size_t bufsize,
+                  CORBA::Environment& env)
 {
   Test::OctetSeq os (bufsize, bufsize, (CORBA::Octet*)buf);
 
-  if ((cdr << os) == 0)
+  cdr.encode (Test::_tc_OctetSeq, &os, 0, env);
+  if (env.exception () != 0)
     return -1;
   return 0;
 }
 
 static int
 test_read_octet (TAO_InputCDR &cdr,
-                 char* /* buf */,
-                 size_t bufsize)
+                 char* /* buf */, 
+                 size_t bufsize,
+                 CORBA::Environment& env)
 {
   Test::OctetSeq os;
 
-  if ((cdr >> os) == 0)
-    return -1;
+  cdr.decode (Test::_tc_OctetSeq, &os, 0, env);
+  if (env.exception () != 0 ||
+      os.length () != bufsize
+      /* || ACE_OS::memcmp( buf, os.get_buffer (), bufsize) != 0 */)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "OCTET: problem demarshalling or unmatched buffer\n"));
+      return -1;
+    }
   return 0;
 }
 
 static int
 test_write_char (TAO_OutputCDR &cdr,
-                 char* buf,
-                 size_t bufsize)
+                 char* buf, 
+                 size_t bufsize,
+                 CORBA::Environment& env)
 {
   Test::CharSeq cs (bufsize, bufsize, buf);
 
-  if ((cdr << cs) == 0)
+  cdr.encode (Test::_tc_CharSeq, &cs, 0, env);
+  if (env.exception () != 0)
     return -1;
   return 0;
 }
 
 static int
 test_read_char (TAO_InputCDR &cdr,
-                char* /* buf */,
-                size_t bufsize)
+                char* /* buf */, 
+                size_t bufsize,
+                CORBA::Environment& env)
 {
   Test::CharSeq cs;
 
-  if ((cdr >> cs) == 0)
-    return -1;
+  cdr.decode (Test::_tc_CharSeq, &cs, 0, env);
+  if (env.exception () != 0 ||
+      cs.length () != bufsize
+      /* || ACE_OS::memcmp( buf, cs.get_buffer (), bufsize) != 0 */)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "CHAR: problem demarshalling or unmatched buffer\n"));
+      return -1;
+    }
   return 0;
 }
 
 typedef
 int (*Writer)(TAO_OutputCDR& cdr,
-              char* buf, size_t bufsize);
+              char* buf, size_t bufsize,
+              CORBA::Environment& env);
 typedef
 int (*Reader)(TAO_InputCDR& cdr,
-              char* buf, size_t bufsize);
+              char* buf, size_t bufsize,
+              CORBA::Environment& env);
 
 int
 run (char* buf, size_t bufsize,
      size_t n, size_t lo, size_t s,
-     int quiet,
      const char* name,
-     Writer writer, Reader reader)
+     Writer writer, Reader reader,
+     CORBA::Environment& env)
 {
-  size_t count = 0;
-  double sum_read = 0;
-  double sum_write = 0;
-
   for (size_t x = lo; x <= bufsize; x += s)
     {
       ACE_High_Res_Timer writing;
@@ -102,17 +120,16 @@ run (char* buf, size_t bufsize,
           writing.start_incr ();
           TAO_OutputCDR output;
 
-          if (writer (output, buf, x) != 0)
+          if (writer (output, buf, x, env) != 0)
             return -1;
           writing.stop_incr ();
 
           reading.start_incr ();
           TAO_InputCDR input (output);
-          if (reader (input, buf, x) != 0)
+          if (reader (input, buf, x, env) != 0)
             return -1;
           reading.stop_incr ();
         }
-
       double m = n;
 
       ACE_Time_Value wtv;
@@ -129,23 +146,9 @@ run (char* buf, size_t bufsize,
 
       double write_average = ACE_U64_TO_U32(wusecs) / m;
       double read_average = ACE_U64_TO_U32(rusecs) / m;
-
-      count++;
-      sum_read += read_average;
-      sum_write += write_average;
-      if (quiet == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s: %d %.3f %.3f\n",
-                      name, x, write_average, read_average));
-        }
-    }
-
-  if (count != 0)
-    {
       ACE_DEBUG ((LM_DEBUG,
-                  "%s total: %.3f %.3f\n",
-                  name, sum_write / count, sum_read / count));
+                  "%s: %d %.3f %.3f\n",
+                  name, x, write_average, read_average));
     }
   return 0;
 }
@@ -153,23 +156,20 @@ run (char* buf, size_t bufsize,
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       int n = 64;
       int lo = 64;
       int hi = 128000;
       int s = 4;
 
-      int quiet = 0;
-
-      ACE_Get_Opt get_opt (argc, argv, "qn:l:h:s:");
+      ACE_Get_Opt get_opt (argc, argv, "n:l:h:s:");
       int opt;
 
       while ((opt = get_opt ()) != EOF)
@@ -188,10 +188,6 @@ main (int argc, char *argv[])
             case 's':
               s = ACE_OS::atoi (get_opt.optarg);
               break;
-            case 'q':
-              quiet = 1;
-              break;
-
             case '?':
             default:
               ACE_DEBUG ((LM_DEBUG,
@@ -227,21 +223,25 @@ main (int argc, char *argv[])
         }
 
       if (run (buf, hi,
-               n, lo, s, quiet,
-               "OCTET", test_write_octet, test_read_octet) != 0)
+               n, lo, s,
+               "OCTET", test_write_octet, test_read_octet,
+               TAO_TRY_ENV) != 0)
         return 1;
+      TAO_CHECK_ENV;
 
       if (run (buf, hi,
-               n, lo, s, quiet,
-               "CHAR", test_write_char, test_read_char) != 0)
+               n, lo, s,
+               "CHAR", test_write_char, test_read_char,
+               TAO_TRY_ENV) != 0)
         return 1;
+      TAO_CHECK_ENV;
       delete[] buf;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "OctetSeq");
+      TAO_TRY_ENV.print_exception ("OctetSeq");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/OctetSeq/README b/TAO/tests/OctetSeq/README
index de0d10c571c..811b52a8da7 100644
--- a/TAO/tests/OctetSeq/README
+++ b/TAO/tests/OctetSeq/README
@@ -1,19 +1,5 @@
 # $Id$
 
-= server, client
-
-	This test verifies that the optimizations for octet sequences
-don't have strange side effects. The clients sends a number of octet
-sequences that are stored by the server, it then queries the CRC
-checksum for several of them (at random) to verify that the contents
-are intact.
-	To run this test try:
-
-$ server -o test.ior
-$ client -k file://test.ior -i 10000 -v
-
-= OctetSeq
-
 	This test measures the time it takes to marshal sequences of
 octets of different sizes. Since TAO optimizes octet sequence
 marshaling it was interesting to compare that time with the time to
@@ -35,10 +21,3 @@ is no need for it).
 	-n <iter>
 		The number of iterations (marshaling/demarshaling)
 		done for each loop.
-
-	-q
-		Be quiet, only print the summary data....
-
-	Example:
-
-$ ./OctetSeq -l 4096 -h 8192 -s 16 -n 32 -q
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
deleted file mode 100644
index 4d65a006d13..00000000000
--- a/TAO/tests/OctetSeq/client.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "testC.h"
-
-ACE_RCSID(OctetSeq, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 5;
-ACE_RANDR_TYPE seed = 0;
-int verbose = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "vk:i:s:");
-  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 's':
-        seed = ACE_OS::atoi (get_opts.optarg);
-        break;
-
-      case 'v':
-        verbose = 1;
-        break;
-
-     case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-s <seed> "
-                           "-v "
-                           "\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 object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Test::Database_var server =
-        Test::Database::_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);
-        }
-
-      if (seed == 0)
-        {
-          seed = ACE_OS::time (0);
-          ACE_DEBUG ((LM_DEBUG, "Seed value is %d\n", seed));
-        }
-
-      const int nelements = 64; // @@ TODO
-      const int maxsize = 1024;
-      Test::OctetSeq elements[nelements];
-
-      for (int i = 0; i != niterations; ++i)
-        {
-          CORBA::ULong r = ACE_OS::rand_r (seed);
-          Test::Index idx = (r % nelements);
-
-          if (i % 100 == 0)
-            {
-              for (int j = 0; j != nelements; ++j)
-                {
-                  CORBA::ULong r = ACE_OS::rand_r (seed);
-                  CORBA::ULong l = r % maxsize;
-                  elements[j].length (l);
-                  for (CORBA::ULong k = 0; k != l; ++k)
-                    {
-                      r = ACE_OS::rand_r (seed);
-                      elements[j][k] = (r % 128);
-                    }
-                  server->set (Test::Index (j), elements[j], ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
-                }
-            }
-
-          CORBA::ULong crc_remote =
-            server->get_crc (idx, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          CORBA::ULong crc_local =
-            ACE::crc32 (ACE_reinterpret_cast (const char*,
-                                              elements[idx].get_buffer ()),
-                        elements[idx].length ());
-
-          if (crc_local != crc_remote)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "CRC mismatch for element %d\n", idx));
-            }
-          else if (verbose == 1)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "CRC <%u> matched for element %d\n",
-                          crc_remote, idx));
-            }
-
-        }
-
-      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/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl
index 96cf18be595..6fb4491e4b2 100755
--- a/TAO/tests/OctetSeq/run_test.pl
+++ b/TAO/tests/OctetSeq/run_test.pl
@@ -6,57 +6,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 unshift @INC, '../../../bin';
-require Process;
 require ACEutils;
 
-print STDERR "\n\n==== Octet sequence passing test\n";
+$status  = system ($EXEPREFIX."OctetSeq$Process::EXE_EXT -n 16 -l 32 -h 512 -s 4");
 
-$file="test.ior";
-
-unlink $file;
-
-$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
-                       "-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".$Process::EXE_EXT,
-                       " -i 5000 -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==== Octet sequence performance test\n";
-
-$T = Process::Create ($EXEPREFIX."OctetSeq$Process::EXE_EXT",
-                      " -n 32 -l 8192 -h 8192 -s 1 -q");
-
-$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;
+exit $status;
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
deleted file mode 100644
index da1925bc1c4..00000000000
--- a/TAO/tests/OctetSeq/server.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "test_i.h"
-
-ACE_RCSID(OctetSeq, 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;
-
-      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;
-
-      Database_i server_impl (orb.in (),
-                              128); // @@ TODO
-
-      Test::Database_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;
-
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
-      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/OctetSeq/test.idl b/TAO/tests/OctetSeq/test.idl
index 4948427d283..cbd7b116caa 100644
--- a/TAO/tests/OctetSeq/test.idl
+++ b/TAO/tests/OctetSeq/test.idl
@@ -9,10 +9,11 @@
 //    test.idl
 //
 // = DESCRIPTION
-//   Simple IDL file to test octet sequences.
+//   Simple IDL file to generate the TypeCodes for sequence<octet> and
+//   sequence<char>.
 //
 // = AUTHORS
-//   Carlos O'Ryan <coryan@cs.wustl.edu>
+//    Carlos O'Ryan <coryan@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -20,36 +21,4 @@ module Test
 {
   typedef sequence<octet> OctetSeq;
   typedef sequence<char> CharSeq;
-
-  typedef unsigned short Index;
-
-  exception OutOfRange {
-    Index min_index;
-    Index max_index;
-  };
-
-  interface Database
-  {
-    // = TITLE
-    //   A database of octet sequences
-    //
-    // = DESCRIPTION
-    //   Just a silly IDL file to test if the ORB can hold octet
-    //   sequences intact between calls.  Regularly this wouldn't be a
-    //   problem, but TAO optimizations for octet sequences make that
-    //   a little trickier to ensure.
-    //
-    void set (in Index i,
-              in OctetSeq value)
-      raises (OutOfRange);
-
-    OctetSeq get (in Index i)
-      raises (OutOfRange);
-
-    unsigned long get_crc (in Index i)
-      raises (OutOfRange);
-
-    oneway void shutdown ();
-    // shutdown the ORB
-  };
 };
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
deleted file mode 100644
index 6a753362db8..00000000000
--- a/TAO/tests/OctetSeq/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(OctetSeq, test_i, "$Id$")
-
-void
-Database_i::set (Test::Index i,
-                 const Test::OctetSeq& seq,
-                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((Test::OutOfRange))
-{
-  if (i >= this->max_range_)
-    ACE_THROW (Test::OutOfRange (0, this->max_range_));
-
-  CORBA::ULong len = seq.length ();
-  // CORBA::ULong max = seq.maximum ();
-  ACE_Message_Block *mb = seq.mb ();
-  if (mb == 0)
-    {
-      this->elements_[i] = seq;
-    }
-  else
-    {
-      this->elements_[i].replace (len, seq.mb ());
-    }
-}
-
-Test::OctetSeq*
-Database_i::get (Test::Index i,
-                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
-{
-  if (i >= this->max_range_)
-    ACE_THROW_RETURN (Test::OutOfRange (0, this->max_range_), 0);
-
-  Test::OctetSeq_var copy;
-  ACE_NEW_THROW_EX (copy,
-                    Test::OctetSeq (this->elements_[i]),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-  return copy._retn ();
-}
-
-CORBA::ULong
-Database_i::get_crc (Test::Index i,
-                     CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
-{
-  if (i >= this->max_range_)
-    ACE_THROW_RETURN (Test::OutOfRange (0, this->max_range_), 0);
-
-  return ACE::crc32 (ACE_reinterpret_cast (const char*,
-                                           this->elements_[i].get_buffer ()),
-                     this->elements_[i].length ());
-}
-
-void
-Database_i::shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC (())
-{
-  this->orb_->shutdown ();
-}
diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h
deleted file mode 100644
index 8809f3bea2b..00000000000
--- a/TAO/tests/OctetSeq/test_i.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/OctetSeq
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_OCTETSEQ_TEST_I_H
-#define TAO_OCTETSEQ_TEST_I_H
-
-#include "testS.h"
-
-class Database_i : public POA_Test::Database
-{
-  // = DESCRIPTION
-  //   Implements the Database interface in test.idl
-  //
-public:
-  Database_i (CORBA::ORB_ptr orb,
-              Test::Index max_range);
-  // ctor
-
-  // = The Simple_Server methods.
-  void set (Test::Index i,
-            const Test::OctetSeq& seq,
-            CORBA::Environment&)
-    ACE_THROW_SPEC ((Test::OutOfRange));
-
-  Test::OctetSeq* get (Test::Index i,
-                       CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
-
-  CORBA::ULong get_crc (Test::Index i,
-                        CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
-
-  void shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC (());
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB pointer
-
-  Test::Index max_range_;
-  // The maximum number of elements in the database
-
-  Test::OctetSeq* elements_;
-  // The elements
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_MT_CLIENT_TEST_I_H */
diff --git a/TAO/tests/OctetSeq/test_i.i b/TAO/tests/OctetSeq/test_i.i
deleted file mode 100644
index eb8ded0afd6..00000000000
--- a/TAO/tests/OctetSeq/test_i.i
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Database_i::Database_i (CORBA::ORB_ptr orb,
-                        Test::Index max_range)
-  :  orb_ (CORBA::ORB::_duplicate (orb)),
-     max_range_ (max_range)
-{
-  ACE_NEW (this->elements_, Test::OctetSeq[this->max_range_]);
-}
diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
index b2e266073a5..d67703155f1 100644
--- a/TAO/tests/Param_Test/Makefile
+++ b/TAO/tests/Param_Test/Makefile
@@ -262,7 +262,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -282,25 +293,14 @@ 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 \
- $(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/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 \
@@ -316,8 +316,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -356,7 +355,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -368,8 +366,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_testSer.h param_testSer_T.h param_testSer_T.i \
- param_testSer_T.cpp param_testSer.i
+ param_testCli.i param_testSer.h param_testSer_T.h param_testS_T.i \
+ param_testSer_T.cpp param_testS.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 \
@@ -516,7 +514,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -536,25 +545,14 @@ 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 \
- $(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/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 \
@@ -570,8 +568,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -610,7 +607,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -622,8 +618,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_testSer_T.h param_testSer_T.i \
- param_testSer_T.cpp param_testSer.i
+ param_testCli.i param_testSer_T.h param_testS_T.i param_testSer_T.cpp \
+ param_testS.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 \
@@ -773,7 +769,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -793,25 +800,14 @@ 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 \
- $(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/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 \
@@ -827,8 +823,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -867,7 +862,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -879,8 +873,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_testSer_T.h param_testSer_T.i \
- param_testSer_T.cpp param_testSer.i
+ param_testCli.i param_testSer_T.h param_testS_T.i param_testSer_T.cpp \
+ param_testS.i
 .obj/param_test_i.o .obj/param_test_i.so .shobj/param_test_i.o .shobj/param_test_i.so: param_test_i.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1027,7 +1021,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1047,25 +1052,14 @@ 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 \
- $(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/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 \
@@ -1081,8 +1075,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1121,7 +1114,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1134,8 +1126,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  param_test_i.h param_testSer.h param_testCli.h param_testCli.i \
- param_testSer_T.h param_testSer_T.i param_testSer_T.cpp \
- param_testSer.i
+ param_testSer_T.h param_testS_T.i param_testSer_T.cpp param_testS.i
 .obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp param_testCli.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -1282,7 +1273,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1302,25 +1304,14 @@ 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 \
- $(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/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 \
@@ -1336,8 +1327,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1376,7 +1366,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1535,7 +1524,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1555,25 +1555,14 @@ 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 \
- $(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/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 \
@@ -1589,8 +1578,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1629,7 +1617,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1641,8 +1628,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_testSer.h param_testSer_T.h param_testSer_T.i \
- param_testSer_T.cpp param_testSer.i
+ param_testCli.i param_testSer.h param_testSer_T.h param_testS_T.i \
+ param_testSer_T.cpp param_testS.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 \
@@ -1789,7 +1776,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -1809,25 +1807,14 @@ 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 \
- $(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/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 \
@@ -1843,8 +1830,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -1883,7 +1869,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -1895,8 +1880,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_testSer_T.h param_testSer_T.i \
- param_testSer_T.cpp param_testSer.i
+ param_testCli.i param_testSer_T.h param_testS_T.i param_testSer_T.cpp \
+ param_testS.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 \
@@ -2043,7 +2028,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
  $(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 \
@@ -2063,25 +2059,14 @@ 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 \
- $(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/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 \
@@ -2097,8 +2082,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2137,7 +2121,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2310,7 +2293,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
  $(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 \
@@ -2330,25 +2324,14 @@ 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 \
- $(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/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 \
@@ -2364,8 +2347,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2404,7 +2386,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2574,7 +2555,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/singletons.h \
  $(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 \
@@ -2594,25 +2586,14 @@ 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 \
- $(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/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 \
@@ -2628,8 +2609,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2668,7 +2648,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -2827,7 +2806,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -2847,25 +2837,14 @@ 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 \
- $(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/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 \
@@ -2881,8 +2860,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -2921,7 +2899,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -3084,7 +3061,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3104,25 +3092,14 @@ 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 \
- $(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/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 \
@@ -3138,8 +3115,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3178,7 +3154,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -3337,7 +3312,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3357,25 +3343,14 @@ 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 \
- $(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/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 \
@@ -3391,8 +3366,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3431,7 +3405,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -3590,7 +3563,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3610,25 +3594,14 @@ 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 \
- $(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/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 \
@@ -3644,8 +3617,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3684,7 +3656,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -3843,7 +3814,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -3863,25 +3845,14 @@ 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 \
- $(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/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 \
@@ -3897,8 +3868,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -3937,7 +3907,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -4096,7 +4065,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -4116,25 +4096,14 @@ 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 \
- $(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/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 \
@@ -4150,8 +4119,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4190,7 +4158,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -4349,7 +4316,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -4369,25 +4347,14 @@ 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 \
- $(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/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 \
@@ -4403,8 +4370,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4443,7 +4409,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -4602,7 +4567,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -4622,25 +4598,14 @@ 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 \
- $(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/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 \
@@ -4656,8 +4621,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4696,7 +4660,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -4855,7 +4818,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -4875,25 +4849,14 @@ 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 \
- $(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/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 \
@@ -4909,8 +4872,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -4949,7 +4911,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -5108,7 +5069,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -5128,25 +5100,14 @@ 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 \
- $(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/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 \
@@ -5162,8 +5123,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -5202,7 +5162,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -5361,7 +5320,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -5381,25 +5351,14 @@ 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 \
- $(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/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 \
@@ -5415,8 +5374,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -5455,7 +5413,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -5614,7 +5571,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -5634,25 +5602,14 @@ 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 \
- $(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/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 \
@@ -5668,8 +5625,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -5708,7 +5664,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -5867,7 +5822,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -5887,25 +5853,14 @@ 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 \
- $(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/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 \
@@ -5921,8 +5876,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -5961,7 +5915,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -6120,7 +6073,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -6140,25 +6104,14 @@ 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 \
- $(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/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 \
@@ -6174,8 +6127,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -6214,7 +6166,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -6373,7 +6324,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -6393,25 +6355,14 @@ 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 \
- $(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/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 \
@@ -6427,8 +6378,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -6467,7 +6417,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -6626,7 +6575,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -6646,25 +6606,14 @@ 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 \
- $(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/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 \
@@ -6680,8 +6629,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -6720,7 +6668,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -6879,7 +6826,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -6899,25 +6857,14 @@ 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 \
- $(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/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 \
@@ -6933,8 +6880,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -6973,7 +6919,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -7132,7 +7077,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -7152,25 +7108,14 @@ 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 \
- $(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/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 \
@@ -7186,8 +7131,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -7226,7 +7170,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -7385,7 +7328,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -7405,25 +7359,14 @@ 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 \
- $(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/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 \
@@ -7439,8 +7382,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -7479,7 +7421,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -7638,7 +7579,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -7658,25 +7610,14 @@ 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 \
- $(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/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 \
@@ -7692,8 +7633,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -7732,7 +7672,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -7891,7 +7830,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -7911,25 +7861,14 @@ 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 \
- $(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/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 \
@@ -7945,8 +7884,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -7985,7 +7923,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -8144,7 +8081,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -8164,25 +8112,14 @@ 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 \
- $(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/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 \
@@ -8198,8 +8135,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -8238,7 +8174,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -8397,7 +8332,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -8417,25 +8363,14 @@ 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 \
- $(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/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 \
@@ -8451,8 +8386,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -8491,7 +8425,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -8650,7 +8583,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -8670,25 +8614,14 @@ 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 \
- $(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/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 \
@@ -8704,8 +8637,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -8744,7 +8676,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -8903,7 +8834,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -8923,25 +8865,14 @@ 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 \
- $(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/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 \
@@ -8957,8 +8888,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -8997,7 +8927,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -9156,7 +9085,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -9176,25 +9116,14 @@ 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 \
- $(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/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 \
@@ -9210,8 +9139,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9250,7 +9178,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -9410,7 +9337,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -9430,25 +9368,14 @@ 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 \
- $(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/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 \
@@ -9464,8 +9391,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9504,7 +9430,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -9663,7 +9588,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -9683,25 +9619,14 @@ 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 \
- $(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/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 \
@@ -9717,8 +9642,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -9757,7 +9681,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -9916,7 +9839,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -9936,25 +9870,14 @@ 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 \
- $(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/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 \
@@ -9970,8 +9893,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -10010,7 +9932,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
@@ -10170,7 +10091,18 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -10190,25 +10122,14 @@ 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 \
- $(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/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 \
@@ -10224,8 +10145,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -10264,7 +10184,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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 \
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 41809a4ee50..1df042f2caf 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -35,7 +35,6 @@ Coffee_i::~Coffee_i (void)
 // get attribute
 Coffee::Desc *
 Coffee_i::description (CORBA::Environment & /*env*/)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee::Desc *desc = new Coffee::Desc;
   desc->name = CORBA::string_dup (this->name_);
@@ -46,7 +45,6 @@ Coffee_i::description (CORBA::Environment & /*env*/)
 void
 Coffee_i::description (const Coffee::Desc &description,
                        CORBA::Environment & /*env*/)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->name_ = CORBA::string_dup (description.name);
 }
@@ -58,8 +56,8 @@ Coffee_i::description (const Coffee::Desc &description,
 
 Param_Test_i::Param_Test_i (const char *coffee_name,
                             CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    obj_ (coffee_name)
+  : obj_ (coffee_name),
+    orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
@@ -75,7 +73,6 @@ Param_Test_i::test_short (CORBA::Short s1,
                           CORBA::Short &s2,
                           CORBA::Short_out s3,
                           CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1 * 2;
   s3 = s1 * 3;
@@ -88,7 +85,6 @@ Param_Test_i::test_ulonglong (CORBA::ULongLong s1,
                               CORBA::ULongLong &s2,
                               CORBA::ULongLong_out s3,
                               CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1 * 2;
   s3 = s1 * 3;
@@ -103,7 +99,6 @@ Param_Test_i::test_unbounded_string (const char *s1,
                                      char *&s2,
                                      CORBA::String_out s3,
                                      CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
   s3 = CORBA::string_dup (s1);
@@ -122,7 +117,6 @@ Param_Test_i::test_bounded_string (const char *s1,
                                    char *&s2,
                                    CORBA::String_out s3,
                                    CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
   s3 = CORBA::string_dup (s1);
@@ -139,7 +133,6 @@ Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                                  Param_Test::Fixed_Struct &s2,
                                  Param_Test::Fixed_Struct_out s3,
                                  CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1;
   s3 = s1;
@@ -148,12 +141,12 @@ Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
 
 // = Sequences
 
-Param_Test::Long_Seq *
-Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1,
-                                  Param_Test::Long_Seq & s2,
-                                  Param_Test::Long_Seq_out s3,
-                                  CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+Param_Test::Long_Seq * Param_Test_i::test_long_sequence (
+                                                         const Param_Test::Long_Seq & s1,
+                                                         Param_Test::Long_Seq & s2,
+                                                         Param_Test::Long_Seq_out s3,
+                                                         CORBA::Environment &
+                                                         )
 {
   Param_Test::Long_Seq
     *ret = new Param_Test::Long_Seq,
@@ -166,12 +159,12 @@ Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1,
   return ret;
 }
 
-Param_Test::Short_Seq *
-Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1,
-                                   Param_Test::Short_Seq & s2,
-                                   Param_Test::Short_Seq_out s3,
-                                   CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+Param_Test::Short_Seq * Param_Test_i::test_short_sequence (
+                                                           const Param_Test::Short_Seq & s1,
+                                                           Param_Test::Short_Seq & s2,
+                                                           Param_Test::Short_Seq_out s3,
+                                                           CORBA::Environment &
+                                                           )
 {
   Param_Test::Short_Seq
     *ret = new Param_Test::Short_Seq,
@@ -184,12 +177,12 @@ Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1,
   return ret;
 }
 
-Param_Test::Bounded_Short_Seq *
-Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & s1,
-                                           Param_Test::Bounded_Short_Seq & s2,
-                                           Param_Test::Bounded_Short_Seq_out s3,
-                                           CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+Param_Test::Bounded_Short_Seq * Param_Test_i::test_bounded_short_sequence (
+                                                                           const Param_Test::Bounded_Short_Seq & s1,
+                                                                           Param_Test::Bounded_Short_Seq & s2,
+                                                                           Param_Test::Bounded_Short_Seq_out s3,
+                                                                           CORBA::Environment &
+                                                                           )
 {
   Param_Test::Bounded_Short_Seq
     *ret = new Param_Test::Bounded_Short_Seq,
@@ -202,12 +195,12 @@ Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq &
   return ret;
 }
 
-Param_Test::Bounded_Long_Seq *
-Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s1,
-                                          Param_Test::Bounded_Long_Seq & s2,
-                                          Param_Test::Bounded_Long_Seq_out s3,
-                                          CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+Param_Test::Bounded_Long_Seq * Param_Test_i::test_bounded_long_sequence (
+                                                                         const Param_Test::Bounded_Long_Seq & s1,
+                                                                         Param_Test::Bounded_Long_Seq & s2,
+                                                                         Param_Test::Bounded_Long_Seq_out s3,
+                                                                         CORBA::Environment &
+                                                                         )
 {
   Param_Test::Bounded_Long_Seq
     *ret = new Param_Test::Bounded_Long_Seq,
@@ -225,7 +218,6 @@ Param_Test_i::test_strseq (const Param_Test::StrSeq &s1,
                            Param_Test::StrSeq &s2,
                            Param_Test::StrSeq_out s3,
                            CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -256,12 +248,12 @@ Param_Test_i::test_strseq (const Param_Test::StrSeq &s1,
   return ret;
 }
 
-Param_Test::Bounded_StrSeq *
-Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1,
-                                   Param_Test::Bounded_StrSeq & s2,
-                                   Param_Test::Bounded_StrSeq_out s3,
-                                   CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+Param_Test::Bounded_StrSeq * Param_Test_i::test_bounded_strseq (
+                                                                const Param_Test::Bounded_StrSeq & s1,
+                                                                Param_Test::Bounded_StrSeq & s2,
+                                                                Param_Test::Bounded_StrSeq_out s3,
+                                                                CORBA::Environment &
+                                                                )
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -283,7 +275,6 @@ Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1,
                                     Param_Test::StructSeq &s2,
                                     Param_Test::StructSeq_out s3,
                                     CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -300,12 +291,12 @@ Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1,
   return ret;
 }
 
-Param_Test::Bounded_StructSeq *
-Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq & s1,
-                                            Param_Test::Bounded_StructSeq & s2,
-                                            Param_Test::Bounded_StructSeq_out s3,
-                                            CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+Param_Test::Bounded_StructSeq * Param_Test_i::test_bounded_struct_sequence (
+                                                                            const Param_Test::Bounded_StructSeq & s1,
+                                                                            Param_Test::Bounded_StructSeq & s2,
+                                                                            Param_Test::Bounded_StructSeq_out s3,
+                                                                            CORBA::Environment &
+                                                                            )
 {
   Param_Test::Bounded_StructSeq
     *ret = new Param_Test::Bounded_StructSeq,
@@ -319,12 +310,12 @@ Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq
 }
 
 
-Param_Test::PathSpec *
-Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1,
-                                              Param_Test::PathSpec & s2,
-                                              Param_Test::PathSpec_out s3,
-                                              CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+Param_Test::PathSpec * Param_Test_i::test_unbounded_struct_sequence (
+                                                                     const Param_Test::PathSpec & s1,
+                                                                     Param_Test::PathSpec & s2,
+                                                                     Param_Test::PathSpec_out s3,
+                                                                     CORBA::Environment &
+                                                                     )
 {
   Param_Test::PathSpec
     *ret = new Param_Test::PathSpec,
@@ -351,12 +342,12 @@ Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1,
 }
 
 
-Param_Test::Coffee_Mix *
-Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1,
-                              Param_Test::Coffee_Mix & s2,
-                              Param_Test::Coffee_Mix_out s3,
-                              CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+Param_Test::Coffee_Mix * Param_Test_i::test_coffe_mix (
+                                                       const Param_Test::Coffee_Mix & s1,
+                                                       Param_Test::Coffee_Mix & s2,
+                                                       Param_Test::Coffee_Mix_out s3,
+                                                       CORBA::Environment &
+                                                       )
 {
   Param_Test::Coffee_Mix
     *ret = new Param_Test::Coffee_Mix,
@@ -394,12 +385,12 @@ Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1,
   return ret;
 }
 
-Param_Test::Bounded_Coffee_Mix *
-Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1,
-                                      Param_Test::Bounded_Coffee_Mix & s2,
-                                      Param_Test::Bounded_Coffee_Mix_out s3,
-                                      CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+Param_Test::Bounded_Coffee_Mix * Param_Test_i::test_bounded_coffe_mix (
+                                                                       const Param_Test::Bounded_Coffee_Mix & s1,
+                                                                       Param_Test::Bounded_Coffee_Mix & s2,
+                                                                       Param_Test::Bounded_Coffee_Mix_out s3,
+                                                                       CORBA::Environment &
+                                                                       )
 {
   Param_Test::Bounded_Coffee_Mix
     *ret = new Param_Test::Bounded_Coffee_Mix,
@@ -442,7 +433,6 @@ Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1,
                            Param_Test::AnySeq &s2,
                            Param_Test::AnySeq_out s3,
                            CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -466,7 +456,6 @@ Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1,
                                Param_Test::Var_Struct &s2,
                                Param_Test::Var_Struct_out s3,
                                CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -488,7 +477,6 @@ Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1,
                                   Param_Test::Nested_Struct &s2,
                                   Param_Test::Nested_Struct_out s3,
                                   CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -510,7 +498,6 @@ Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1,
                                      Param_Test::Recursive_Struct &s2,
                                      Param_Test::Recursive_Struct_out s3,
                                      CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" structs into all the inout, out and return sequences.
 
@@ -531,7 +518,6 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
                                   Param_Test::Objref_Struct &s2,
                                   Param_Test::Objref_Struct_out s3,
                                   CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
 
@@ -550,7 +536,6 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
 // make a Coffee object
 Coffee_ptr
 Param_Test_i::make_coffee (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->obj_._this (ACE_TRY_ENV);
 }
@@ -561,7 +546,6 @@ Param_Test_i::test_objref (Coffee_ptr o1,
                            Coffee_ptr &o2,
                            Coffee_out o3,
                            CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee_ptr ret = Coffee::_nil ();
 
@@ -606,7 +590,6 @@ Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1,
                              CORBA::TypeCode_ptr &t2,
                              CORBA::TypeCode_out t3,
                              CORBA::Environment &/*env*/)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we simply assign t1 to the others
   CORBA::TypeCode_ptr retval = CORBA::TypeCode::_duplicate (t1);
@@ -621,7 +604,6 @@ Param_Test_i::test_any (const CORBA::Any &a1,
                         CORBA::Any &a2,
                         CORBA::Any_out a3,
                         CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any *ret;
   CORBA::Short short_in;
@@ -761,7 +743,6 @@ Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1,
                                 Param_Test::Fixed_Array a2,
                                 Param_Test::Fixed_Array_out a3,
                                 CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Fixed_Array_slice *ret;
 
@@ -777,7 +758,6 @@ Param_Test_i::test_var_array (const Param_Test::Var_Array a1,
                               Param_Test::Var_Array a2,
                               Param_Test::Var_Array_out a3,
                               CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Var_Array_slice *ret;
 
@@ -792,8 +772,6 @@ Param_Test_i::test_exception (CORBA::ULong s1,
                               CORBA::ULong& s2,
                               CORBA::ULong_out s3,
                               CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Param_Test::Ooops))
 {
   int d = this->test_exception_count_ % 3;
   this->test_exception_count_++;
@@ -813,7 +791,6 @@ Param_Test_i::test_big_union (const Param_Test::Big_Union& u1,
                               Param_Test::Big_Union& u2,
                               Param_Test::Big_Union_out u3,
                               CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1));
   u2 = u1;
@@ -826,7 +803,6 @@ Param_Test_i::test_complex_any (const CORBA::Any &a1,
                                 CORBA::Any &a2,
                                 CORBA::Any_out a3,
                                 CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_var ret (new CORBA::Any (a1));
   a2 = a1;
@@ -840,7 +816,6 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
                                   Param_Test::Multdim_Array a2,
                                   Param_Test::Multdim_Array_out a3,
                                   CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Multdim_Array_slice *ret;
 
@@ -854,7 +829,6 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
 
 void
 Param_Test_i::shutdown (CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index ce378a917b6..7095a182d41 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -31,13 +31,11 @@ public:
 
   // =methods for the attribute
 
-  virtual Coffee::Desc * description (CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Coffee::Desc * description (CORBA::Environment &env);
   // get attribute
 
   virtual void description (const Coffee::Desc &description,
-                            CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                            CORBA::Environment &env);
   // set attribute
 
 private:
@@ -63,37 +61,32 @@ public:
   virtual CORBA::Short test_short (CORBA::Short s1,
                                    CORBA::Short &s2,
                                    CORBA::Short_out s3,
-                                   CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                   CORBA::Environment &env);
   // test for shorts
 
   virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1,
                                            CORBA::ULongLong &s2,
                                            CORBA::ULongLong_out s3,
-                                           CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                           CORBA::Environment &env);
   // test for unsigned long long
 
   virtual char *test_unbounded_string (const char *s1,
                                        char *&s2,
                                        CORBA::String_out s3,
-                                       CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                       CORBA::Environment &env);
   // test for unbounded strings
 
   virtual char *test_bounded_string (const char *s1,
                                      char *&s2,
                                      CORBA::String_out s3,
-                                     CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                     CORBA::Environment &env);
   // test for bounded strings
 
   virtual Param_Test::Fixed_Struct
   test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                      Param_Test::Fixed_Struct &s2,
                      Param_Test::Fixed_Struct_out s3,
-                     CORBA::Environment &env)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                     CORBA::Environment &env);
   // test for fixed structures
 
   // = Start of sequences tests...
@@ -101,172 +94,158 @@ public:
       const Param_Test::Long_Seq & s1,
       Param_Test::Long_Seq & s2,
       Param_Test::Long_Seq_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence (
       const Param_Test::Bounded_Long_Seq & s1,
       Param_Test::Bounded_Long_Seq & s2,
       Param_Test::Bounded_Long_Seq_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::Short_Seq * test_short_sequence (
-      const Param_Test::Short_Seq & s1,
+          const Param_Test::Short_Seq & s1,
       Param_Test::Short_Seq & s2,
       Param_Test::Short_Seq_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence (
           const Param_Test::Bounded_Short_Seq & s1,
       Param_Test::Bounded_Short_Seq & s2,
       Param_Test::Bounded_Short_Seq_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::StrSeq * test_strseq (
       const Param_Test::StrSeq & s1,
       Param_Test::StrSeq & s2,
       Param_Test::StrSeq_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::Bounded_StrSeq * test_bounded_strseq (
       const Param_Test::Bounded_StrSeq & s1,
       Param_Test::Bounded_StrSeq & s2,
       Param_Test::Bounded_StrSeq_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::StructSeq * test_struct_sequence (
       const Param_Test::StructSeq & s1,
       Param_Test::StructSeq & s2,
       Param_Test::StructSeq_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::PathSpec * test_unbounded_struct_sequence (
       const Param_Test::PathSpec & s1,
       Param_Test::PathSpec & s2,
       Param_Test::PathSpec_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence (
       const Param_Test::Bounded_StructSeq & s1,
       Param_Test::Bounded_StructSeq & s2,
       Param_Test::Bounded_StructSeq_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::Coffee_Mix * test_coffe_mix (
       const Param_Test::Coffee_Mix & s1,
       Param_Test::Coffee_Mix & s2,
       Param_Test::Coffee_Mix_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix (
       const Param_Test::Bounded_Coffee_Mix & s1,
       Param_Test::Bounded_Coffee_Mix & s2,
       Param_Test::Bounded_Coffee_Mix_out s3,
-      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CORBA::Environment &env
+     );
   virtual Param_Test::AnySeq * test_anyseq (
           const Param_Test::AnySeq & s1,
           Param_Test::AnySeq & s2,
           Param_Test::AnySeq_out s3,
-          CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+          CORBA::Environment &env
+          );
   // = End of sequences tests....
 
   virtual Param_Test::Var_Struct *
   test_var_struct (const Param_Test::Var_Struct &s1,
                    Param_Test::Var_Struct &s2,
                    Param_Test::Var_Struct_out s3,
-                   CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                   CORBA::Environment &env);
   // test for variable structs
 
   virtual Param_Test::Nested_Struct *
   test_nested_struct (const Param_Test::Nested_Struct &s1,
                       Param_Test::Nested_Struct &s2,
                       Param_Test::Nested_Struct_out s3,
-                      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Environment &env);
   // test for nested structs
 
   virtual Param_Test::Recursive_Struct *
     test_recursive_struct (const Param_Test::Recursive_Struct &rs1,
                            Param_Test::Recursive_Struct &rs2,
                            Param_Test::Recursive_Struct_out rs3,
-                           CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           CORBA::Environment &env);
   // test for recursive structs
 
   virtual Param_Test::Objref_Struct *
   test_objref_struct (const Param_Test::Objref_Struct &s1,
                       Param_Test::Objref_Struct &s2,
                       Param_Test::Objref_Struct_out s3,
-                      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Environment &env);
 
   virtual Coffee_ptr
-  make_coffee (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  make_coffee (CORBA::Environment &env);
   // make a coffee object
 
   virtual Coffee_ptr
   test_objref (Coffee_ptr o1,
                Coffee_ptr &o2,
                Coffee_out o3,
-               CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+               CORBA::Environment &env);
   // test for object references
 
   virtual CORBA::TypeCode_ptr
   test_typecode (CORBA::TypeCode_ptr t1,
                  CORBA::TypeCode_ptr &o2,
                  CORBA::TypeCode_out o3,
-                 CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                 CORBA::Environment &env);
   // test for typecodes
 
   virtual CORBA::Any *
   test_any (const CORBA::Any &a1,
             CORBA::Any &a2,
             CORBA::Any_out a3,
-            CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+            CORBA::Environment &env);
   // test for Anys
 
   virtual Param_Test::Fixed_Array_slice *
   test_fixed_array (const Param_Test::Fixed_Array a1,
                     Param_Test::Fixed_Array a2,
                     Param_Test::Fixed_Array_out a3,
-                    CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Environment &env);
   // test for fixed size arrays
 
   virtual Param_Test::Var_Array_slice *
   test_var_array (const Param_Test::Var_Array a1,
                   Param_Test::Var_Array a2,
                   Param_Test::Var_Array_out a3,
-                  CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                  CORBA::Environment &env);
   // test for arrays of variable types
 
   virtual CORBA::ULong test_exception (CORBA::ULong s1,
                                        CORBA::ULong& s2,
                                        CORBA::ULong_out s3,
-                                       CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Param_Test::Ooops));
+                                       CORBA::Environment &env);
 
   virtual Param_Test::Big_Union*
     test_big_union (const Param_Test::Big_Union& u1,
                     Param_Test::Big_Union& u2,
                     Param_Test::Big_Union_out u3,
-                    CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                    CORBA::Environment &env);
 
   virtual CORBA::Any*
     test_complex_any (const CORBA::Any &a1,
                       CORBA::Any &a2,
                       CORBA::Any_out a3,
-                      CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Environment &env);
 
 # if 0
   // Test for multi dimensional arrays
@@ -274,24 +253,21 @@ public:
   test_multdim_array (const Param_Test::Multdim_Array,
                       Param_Test::Multdim_Array ,
                       Param_Test::Multdim_Array_out ,
-                      CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Environment &);
 
 #endif
-  void shutdown (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void shutdown (CORBA::Environment &env);
 
 
 private:
-  CORBA::ORB_var orb_;
-  // Remember out ORB.
-
   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.
+
+  CORBA::ORB_var orb_;
 };
 
 #endif /* PARAM_TEST_I_H */
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index a03f76443d2..9b7fc42632d 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -16,38 +16,27 @@ $other = "";
 $debug = "";
 $type = "";
 
-unlink $iorfile;
-
 sub run_test
 {
   my $type = shift(@_);
 
-  unlink $iorfile; # Ignore errors
   $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
                          "$debug -o $iorfile");
 
-  if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-  }
+  ACE::waitforfile ($iorfile);
 
-  $CL = Process::Create ($EXEPREFIX."client",
-			 " $debug -f $iorfile  -i $invocation -t ".
-			 "$type -n $num -x");
+  system ($EXEPREFIX."client $debug -f $iorfile  -i $invocation -t ".
+          "$type -n $num -x");
 
-  $client = $CL->TimedWait (60);
-  if ($client == -1) {
-    print STDERR "ERROR: client timedout\n";
-    $CL->Kill (); $CL->TimedWait (1);
-  }
+  # @@
+  # Someday, a better way of doing this should be found.  Or at least
+  # something that can tell if a server is still alive.  There is kill -0 on
+  # Unix, but on NT ???
 
-  $server = $SV->TimedWait (2);
-  if ($server == -1) {
-    print STDERR "ERROR: server timedout\n";
-    $SV->Kill (); $SV->TimedWait (1);
-  }
-  unlink $iorfile;
+  sleep 3;
+
+  $SV->Kill (); $SV->Wait ();
+  unlink ($iorfile);
 }
 
 # Parse the arguments
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index 68ed2845747..2ef36e16eb7 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      const char *orb_name = "";
+      char *orb_name = "internet";
       CORBA::ORB_var orb_ptr =
         CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Param_Test/svc.conf b/TAO/tests/Param_Test/svc.conf
index 87254515cb9..599839eb910 100644
--- a/TAO/tests/Param_Test/svc.conf
+++ b/TAO/tests/Param_Test/svc.conf
@@ -2,5 +2,6 @@
 #
 # Please read $TAO_ROOT/docs/Options.html for details.
 #
-
-static Server_Strategy_Factory "-ORBtablesize 128"
+static Resource_Factory "-ORBresources global"
+static Client_Strategy_Factory ""
+static Server_Strategy_Factory "-ORBconcurrency reactive -ORBtablesize 128"
diff --git a/TAO/tests/Param_Test/tmplinst.cpp b/TAO/tests/Param_Test/tmplinst.cpp
index a911a0af3ee..da569288cb7 100644
--- a/TAO/tests/Param_Test/tmplinst.cpp
+++ b/TAO/tests/Param_Test/tmplinst.cpp
@@ -15,9 +15,9 @@ template class TAO_Bounded_Sequence<CORBA::Short,32>;
 template class TAO_Bounded_String_Sequence<32>;
 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>;
+template class TAO_Unbounded_Object_Sequence<Coffee>;
+template class TAO_Bounded_Object_Sequence<Coffee,32>;
+template class TAO_Object_Manager<Coffee>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate TAO_Unbounded_Sequence<CORBA::Any>
 #pragma instantiate TAO_Bounded_Sequence<CORBA::Long,32>
@@ -26,7 +26,7 @@ template class TAO_Object_Manager<Coffee,Coffee_var>;
 #pragma instantiate TAO_Bounded_String_Sequence<32>
 #pragma instantiate TAO_Unbounded_Sequence<Param_Test::Fixed_Struct>
 #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>
+#pragma instantiate TAO_Unbounded_Object_Sequence<Coffee>
+#pragma instantiate TAO_Bounded_Object_Sequence<Coffee,32>
+#pragma instantiate TAO_Object_Manager<Coffee>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
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/utils/Makefile b/TAO/utils/Makefile
index d9dd6ec212c..28681103909 100644
--- a/TAO/utils/Makefile
+++ b/TAO/utils/Makefile
@@ -9,8 +9,7 @@
 #----------------------------------------------------------------------------
 
 DIRS  = catior \
-	IOR-parser \
-	nslist
+	IOR-parser
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/utils/README b/TAO/utils/README
deleted file mode 100644
index 1f17904c9cb..00000000000
--- a/TAO/utils/README
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id$
-
-This directory contains the following useful utilities for working
-with TAO.
-
-        . catior -- This utility that takes in a stringified IOR and 
-          decodes it, printing out the information contained in it.
-
-        . IOR-parser -- The "ior-parser" utility is similar to catior,
-          i.e,. parses IORs generated by ORBs.
-
-        . nslist -- This utility lists the current entries in the
-          Naming Service in a nicely formatter manner. 
diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile
index 68a9af5f412..6a3b7eb69d9 100644
--- a/TAO/utils/catior/Makefile
+++ b/TAO/utils/catior/Makefile
@@ -192,7 +192,18 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(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 \
@@ -212,25 +223,14 @@ 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 \
- $(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/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 \
@@ -246,8 +246,7 @@ include $(TAO_ROOT)/taoconfig.mk
  $(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/iopfwd.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
  $(TAO_ROOT)/tao/Stub.i \
@@ -286,7 +285,6 @@ include $(TAO_ROOT)/taoconfig.mk
  $(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 \
@@ -299,56 +297,10 @@ include $(TAO_ROOT)/taoconfig.mk
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(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/UIOP_Profile.h \
- $(TAO_ROOT)/tao/UIOP_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/LSOCK_Acceptor.h \
- $(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 \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.i \
- $(TAO_ROOT)/tao/UIOP_Connect.i \
- $(TAO_ROOT)/tao/UIOP_Profile.i
+ $(TAO_ROOT)/tao/IIOP_Profile.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/utils/catior/README b/TAO/utils/catior/README
index b26c06d951c..7fdd5327acf 100644
--- a/TAO/utils/catior/README
+++ b/TAO/utils/catior/README
@@ -1,7 +1,7 @@
 $Id$
 
-CatIOR is a utility that takes in a stringified IOR and decodes it,
-printing out the information contained in it.
+CatIOR is a small utility that takes in a stringified IOR and decode
+it, printing out the information contained in it.
 
 Usage
 -----
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index f6e8b294ca1..7efa5406897 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -122,10 +122,6 @@ static CORBA::Boolean
 cat_uiop_profile (TAO_InputCDR& cdr);
 
 static CORBA::Boolean
-cat_octet_seq (const char *object_name,
-               TAO_InputCDR& stream);
-
-static CORBA::Boolean
 catior (CORBA::String str,
         CORBA::Environment &env)
 {
@@ -245,23 +241,17 @@ catior (CORBA::String str,
 
         if (tag == TAO_IOP_TAG_INTERNET_IOP)
           {
-            ACE_DEBUG ((LM_DEBUG, "%{"));
             continue_decoding = cat_iiop_profile (stream);
-            ACE_DEBUG ((LM_DEBUG, "%}"));
           }
         else if (tag == TAO_IOP_TAG_UNIX_IOP)
           {
-            ACE_DEBUG ((LM_DEBUG, "%{"));
             continue_decoding = cat_uiop_profile (stream);
-            ACE_DEBUG ((LM_DEBUG, "%}"));
           }
         else
           {
-            ACE_DEBUG ((LM_DEBUG, "%{"));
             continue_decoding = stream.skip_string ();
             ACE_DEBUG ((LM_DEBUG,
-                        "%I unknown tag %d skipping\n", tag));
-            ACE_DEBUG ((LM_DEBUG, "%}"));
+                        "unknown tag %d skipping\n", tag));
           }
       }
   return 1;
@@ -518,86 +508,57 @@ main (int argc, char *argv[])
 }
 
 static CORBA::Boolean
-cat_octet_seq (const char *object_name,
-               TAO_InputCDR& stream)
+cat_object_key (TAO_InputCDR& stream)
 {
-  CORBA::ULong length = 0;
-  if (stream.read_ulong (length) == 0)
+  // ... and object key.
+
+  CORBA::ULong objKeyLength = 0;
+  if (stream.read_ulong (objKeyLength) == 0)
     return 1;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%I %s len:\t%d\n",
-              object_name,
-              length));
+              "Object Key len:\t%d\n",
+              objKeyLength));
 
   ACE_DEBUG ((LM_DEBUG,
-              "%I %s as hex:\n",
-              object_name));
+              "Object Key as hex:\n"));
 
   CORBA::Octet anOctet;
-  CORBA::String objKey = CORBA::string_alloc (length + 1);
+  CORBA::String objKey = CORBA::string_alloc (objKeyLength + 1);
 
   short counter = -1;
 
-  ACE_DEBUG ((LM_DEBUG, "%I "));
   u_int i = 0;
 
-  for (; i < length; i++)
+  for (; i < objKeyLength; i++)
     {
-      if (++counter == 16)
+      if (++counter == 8)
         {
-          ACE_DEBUG ((LM_DEBUG, "\n%I "));
+          ACE_DEBUG ((LM_DEBUG,
+                      "\n"));
           counter = 0;
         }
       stream.read_octet (anOctet);
 
-      ACE_DEBUG ((LM_DEBUG, "%02.2x ", anOctet));
+      ACE_DEBUG ((LM_DEBUG,
+                  "%x ",
+                  anOctet));
       objKey[i] = (char) anOctet;
     }
 
   objKey[i] = '\0';
 
   ACE_DEBUG ((LM_DEBUG,
-              "\n%I The %s as string:\n%I ",
-              object_name));
+              "\nThe Object Key as string:\n"));
 
-  for (i = 0; i < length; i++)
-    ACE_DEBUG ((LM_DEBUG, "%c", objKey[i]));
+  for (i = 0; i < objKeyLength; i++)
+    ACE_DEBUG ((LM_DEBUG,
+                "%c",
+                objKey[i]));
 
   CORBA::string_free (objKey);
-  ACE_DEBUG ((LM_DEBUG, "\n"));
-
-  return 1;
-}
-
-static CORBA::Boolean
-cat_object_key (TAO_InputCDR& stream)
-{
-  // ... and object key.
-
-  return cat_octet_seq ("Object Key", stream);
-}
-
-static CORBA::Boolean
-cat_tagged_components (TAO_InputCDR& stream)
-{
-  // ... and object key.
-  CORBA::ULong len;
-  stream >> len;
-
-  for (CORBA::ULong i = 0;
-       i != len;
-       ++i)
-    {
-      CORBA::ULong tag;
-      stream >> tag;
-      ACE_DEBUG ((LM_DEBUG,
-                  "%I The component <%d> has tag <%d>\n", i, tag));
-      ACE_DEBUG ((LM_DEBUG, "%{%{"));
-      cat_octet_seq ("Component Value", stream);
-      ACE_DEBUG ((LM_DEBUG, "%}%}"));
-    }
-
+  ACE_DEBUG ((LM_DEBUG,
+              "\n"));
   return 1;
 }
 
@@ -631,12 +592,12 @@ cat_iiop_profile (TAO_InputCDR& stream)
   // encapsulation...
   CORBA::Octet iiop_version_major, iiop_version_minor;
   if (! (str.read_octet (iiop_version_major)
-         && iiop_version_major == 1
+         && iiop_version_major == TAO_IIOP_Profile::DEF_IIOP_MAJOR
          && str.read_octet (iiop_version_minor)
-         && iiop_version_minor <= 1))
+         && iiop_version_minor <= TAO_IIOP_Profile::DEF_IIOP_MINOR))
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "%I detected new v%d.%d IIOP profile",
+                  "detected new v%d.%d IIOP profile",
                   iiop_version_major,
                   iiop_version_minor));
       return 1;
@@ -653,27 +614,21 @@ cat_iiop_profile (TAO_InputCDR& stream)
   if ((str >> hostname) == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "%I problem decoding hostname\n"));
+                  "problem decoding hostname\n"));
       return 1;
     }
 
   str >> port_number;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%I Host Name:\t%s\n",
+              "Host Name:\t%s\n",
               hostname));
   ACE_DEBUG ((LM_DEBUG,
-              "%I Port Number:\t%d\n",
+              "Port Number:\t%d\n",
               port_number));
   CORBA::string_free (hostname);
 
-  if (cat_object_key (str) == 0)
-    return 0;
-
-  if (cat_tagged_components (str) == 0)
-    return 0;
-
-  return 1;
+  return cat_object_key (str);
 }
 
 static CORBA::Boolean
@@ -702,19 +657,19 @@ cat_uiop_profile (TAO_InputCDR& stream)
   // encapsulation...
   CORBA::Octet iiop_version_major, iiop_version_minor;
   if (! (str.read_octet (iiop_version_major)
-         && iiop_version_major == 1
+         && iiop_version_major == TAO_UIOP_Profile::DEF_UIOP_MAJOR
          && str.read_octet (iiop_version_minor)
-         && iiop_version_minor <= 1))
+         && iiop_version_minor <= TAO_UIOP_Profile::DEF_UIOP_MINOR))
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "%I detected new v%d.%d UIOP profile",
+                  "detected new v%d.%d UIOP profile",
                   iiop_version_major,
                   iiop_version_minor));
       return 1;
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              "%I UIOP Version:\t%d.%d\n",
+              "UIOP Version:\t%d.%d\n",
               iiop_version_major,
               iiop_version_minor));
 
@@ -724,14 +679,8 @@ cat_uiop_profile (TAO_InputCDR& stream)
     return 0;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%I Rendezvous point:\t%s\n",
+              "Rendezvous point:\t%s\n",
               rendezvous.in ()));
 
-  if (cat_object_key (str) == 0)
-    return 0;
-
-  if (cat_tagged_components (str) == 0)
-    return 0;
-
-  return 1;
+  return cat_object_key (str);
 }
diff --git a/TAO/utils/nslist/Makefile b/TAO/utils/nslist/Makefile
deleted file mode 100644
index 4fc9c3da98d..00000000000
--- a/TAO/utils/nslist/Makefile
+++ /dev/null
@@ -1,312 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-#	Makefile for the nslist utility
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-CPPFLAGS+= -I$(TAO_ROOT)/orbsvcs
-LDLIBS	= -lTAO -lorbsvcs
-
-BIN2	= nslist
-
-SRC	= nslist.cpp
-
-BUILD	= $(VBIN)
-
-#### 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 (Time,$(findstring Time,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Time
-
-#----------------------------------------------------------------------------
-#	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.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/nslist.o .obj/nslist.so .shobj/nslist.o .shobj/nslist.so: nslist.cpp \
- $(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/CosNamingC.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/CosNamingC.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/utils/nslist/README b/TAO/utils/nslist/README
deleted file mode 100644
index f005fda5784..00000000000
--- a/TAO/utils/nslist/README
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id$
-
-This utility lists the current entries in the Naming Service in a
-nicely formatted manner.  To run it, just type 
-
-% nslist
-
-and it'll print the contents of the default "NameService" returned by
-resolve_initial_references().  You can select the IOR of this
-NameService via the options described in
-
-$TAO_ROOT/docs/Options.html
-
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
deleted file mode 100644
index 5c910a23ece..00000000000
--- a/TAO/utils/nslist/nslist.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    utils
-//
-// = FILENAME
-//    nslist.cpp
-//
-// = DESCRIPTION
-//    Naming Service listing utility
-//
-// = AUTHOR
-//     Written 1999-06-03 by Thomas Lockhart, NASA/JPL <Thomas.Lockhart@jpl.nasa.gov>
-//
-// ============================================================================
-
-#include "tao/TAO.h"
-#include "orbsvcs/CosNamingC.h"
-
-static void list_context (CosNaming::NamingContext_ptr nc, int level);
-
-// Display NS entries from a finite list.
-
-static void
-show_chunk (CosNaming::NamingContext_ptr nc,
-            const CosNaming::BindingList &bl,
-            int level)
-{
-  for (CORBA::ULong i = 0;
-       i < bl.length ();
-       i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "%*s%s",
-                  2 * level,
-                  "",
-                  bl[i].binding_name[0].id.in ()));
-
-      if (ACE_OS::strlen(bl[i].binding_name[0].kind) > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%s)",
-                    bl[i].binding_name[0].kind.in ()));
-
-      // If this is a context node, follow it down to the next
-      // level...
-      if (bl[i].binding_type == CosNaming::ncontext)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ": context\n"));
-
-          CosNaming::Name Name;
-          Name.length (1);
-          Name[0].id =
-            CORBA::string_dup (bl[i].binding_name[0].id);
-
-          CORBA::Object_var obj = nc->resolve (Name);
-
-          CosNaming::NamingContext_var xc =
-            CosNaming::NamingContext::_narrow (obj);
-          list_context (xc, level + 1);
-        }
-      // Mark this node as a reference
-      else
-        // The next version should resolve and show the IOR...
-        ACE_DEBUG ((LM_DEBUG,
-                    ": reference\n"));
-    }
-}
-
-static void
-list_context (CosNaming::NamingContext_ptr nc,
-              int level)
-{
-  CosNaming::BindingIterator_var it;
-  CosNaming::BindingList_var bl;
-  const CORBA::ULong CHUNK = 100;
-
-  nc->list (CHUNK, bl, it);
-  show_chunk (nc, bl, level);
-
-  if (!CORBA::is_nil (it.in ()))
-    {
-      CORBA::Boolean more;
-
-      do
-        {
-          more = it->next_n (CHUNK, bl);
-          show_chunk (nc, bl, level);
-        }
-      while (more);
-
-      it->destroy();
-    }
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv);
-
-      CORBA::Object_var obj;
-      obj = orb->resolve_initial_references ("NameService");
-      ACE_TRY_CHECK;
-
-      CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (obj);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var str =
-        orb->object_to_string (root_nc.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (obj))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Naming Service not found"),
-                          -1);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Naming Service: <%s> ---------\n",
-                  str.in ()));
-
-      list_context (root_nc, 1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in nslist");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/VERSION b/VERSION
index 4c539097b4b..10b71a7e265 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 4.6.41, released Tue Jun 08 14:01:51 1999.
+This is ACE version 4.6.40, released Sat May 22 16:36:14 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/ace/ACE.cpp b/ace/ACE.cpp
index b5f7d325e98..5b96172d8e6 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -1222,14 +1222,16 @@ ACE::leave_recv_timedwait (ACE_HANDLE handle,
                            int val)
 {
   if (timeout != 0
-      && ACE_BIT_DISABLED (val,
-                           ACE_NONBLOCK))
+      && ACE_BIT_DISABLED (val, ACE_NONBLOCK))
     {
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
+      // We need to stash errno here because ACE::clr_flags() may
+      // reset it.
+      int error = errno;
+
       // Only disable ACE_NONBLOCK if we weren't in non-blocking mode
       // originally.
       ACE::clr_flags (handle, ACE_NONBLOCK);
+      errno = error;
     }
 }
 
@@ -1302,11 +1304,14 @@ ACE::leave_send_timedwait (ACE_HANDLE handle,
   if (timeout != 0
       && ACE_BIT_DISABLED (val, ACE_NONBLOCK))
     {
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
+      // We need to stash errno here because ACE::clr_flags() may
+      // reset it.
+      int error = errno;
+
       // Only disable ACE_NONBLOCK if we weren't in non-blocking mode
       // originally.
       ACE::clr_flags (handle, ACE_NONBLOCK);
+      errno = error;
     }
 }
 
diff --git a/ace/ATM_Addr.cpp b/ace/ATM_Addr.cpp
index dbd94db1acb..dcf40446f37 100644
--- a/ace/ATM_Addr.cpp
+++ b/ace/ATM_Addr.cpp
@@ -48,12 +48,6 @@ ACE_ATM_Addr::ACE_ATM_Addr (unsigned char selector)
 
 ACE_ATM_Addr::ACE_ATM_Addr (const ACE_ATM_Addr &sap,
                             unsigned char selector)
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  : ACE_Addr (AF_ATM,
-#else
-  : ACE_Addr (AF_UNSPEC,
-#endif /* ACE_HAS_FORE_ATM_XTI */
-              sizeof this->atm_addr_)
 {
   ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
   this->set (sap, selector);
@@ -61,12 +55,6 @@ ACE_ATM_Addr::ACE_ATM_Addr (const ACE_ATM_Addr &sap,
 
 ACE_ATM_Addr::ACE_ATM_Addr (const ATMSAPAddress *sap,
                             unsigned char selector)
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  : ACE_Addr (AF_ATM,
-#else
-  : ACE_Addr (AF_UNSPEC,
-#endif /* ACE_HAS_FORE_ATM_XTI */
-              sizeof this->atm_addr_)
 {
   ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
   this->set (sap, selector);
@@ -74,12 +62,6 @@ ACE_ATM_Addr::ACE_ATM_Addr (const ATMSAPAddress *sap,
 
 ACE_ATM_Addr::ACE_ATM_Addr (const ASYS_TCHAR sap[],
                             unsigned char selector)
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  : ACE_Addr (AF_ATM,
-#else
-  : ACE_Addr (AF_UNSPEC,
-#endif /* ACE_HAS_FORE_ATM_XTI */
-              sizeof this->atm_addr_)
 {
   ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
   this->set (sap, selector);
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index aa026c9b1bc..990ccd91323 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -580,12 +580,32 @@ ACE_InputCDR::ACE_InputCDR (size_t bufsiz,
 
 ACE_InputCDR::ACE_InputCDR (const ACE_Message_Block *data,
                             int byte_order)
-  : start_ (),
+  : start_ (ACE_CDR::total_length (data, 0) + ACE_CDR::MAX_ALIGNMENT),
+ // @@ We may need allocators for the previous line, and the size may
+ // be a standard ACE_*CDR size...
+    do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER),
     good_bit_ (1),
     char_translator_ (0),
     wchar_translator_ (0)
 {
-  this->reset (data, byte_order);
+  // We must copy the contents of <data> into the new buffer, but
+  // respecting the alignment.
+  ptr_arith_t curalign =
+    ptr_arith_t(data->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
+  ptr_arith_t tmpalign =
+    ptr_arith_t(this->start_.rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
+  int offset = curalign - tmpalign;
+  if (offset < 0)
+    offset += ACE_CDR::MAX_ALIGNMENT;
+  this->start_.rd_ptr (offset);
+  this->start_.wr_ptr (offset);
+
+  for (const ACE_Message_Block* i = data;
+       i != 0;
+       i = i->cont ())
+    {
+      this->start_.copy (i->rd_ptr (), i->length ());
+    }
 }
 
 ACE_InputCDR::ACE_InputCDR (ACE_Data_Block *data,
@@ -973,6 +993,8 @@ ACE_InputCDR::skip_bytes (size_t len)
   return 0;
 }
 
+
+
 int
 ACE_InputCDR::grow (size_t newsize)
 {
@@ -983,42 +1005,3 @@ ACE_InputCDR::grow (size_t newsize)
   this->start_.wr_ptr (newsize);
   return 0;
 }
-
-void
-ACE_InputCDR::reset (const ACE_Message_Block* data,
-                     int byte_order)
-{
-  this->reset_byte_order (byte_order);
-  this->start_.size (ACE_CDR::total_length (data, 0)
-                     + ACE_CDR::MAX_ALIGNMENT);
-
-  // We must copy the contents of <data> into the new buffer, but
-  // respecting the alignment.
-  ptr_arith_t curalign =
-    ptr_arith_t(data->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
-  ptr_arith_t tmpalign =
-    ptr_arith_t(this->start_.rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
-  int offset = curalign - tmpalign;
-  if (offset < 0)
-    offset += ACE_CDR::MAX_ALIGNMENT;
-  this->start_.rd_ptr (offset);
-  this->start_.wr_ptr (offset);
-
-  for (const ACE_Message_Block* i = data;
-       i != 0;
-       i = i->cont ())
-    {
-      this->start_.copy (i->rd_ptr (), i->length ());
-    }
-}
-
-ACE_Message_Block*
-ACE_InputCDR::steal_contents (void)
-{
-  ACE_Message_Block* block =
-    this->start_.clone ();
-  this->start_.data_block (block->data_block ()->clone ());
-  ACE_CDR::mb_align (&this->start_);
-
-  return block;
-}
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index cff1f7f38da..aea71014629 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -704,7 +704,7 @@ public:
   //   CDR stream from a socket or file.
 
   int grow (size_t newsize);
-  // Grow the internal buffer, reset rd_ptr() to the first byte in the
+  // Grow the internal buffer, reset rd_ptr() to the first byte in the 
   // new buffer that is properly aligned, and set wr_ptr() to
   // rd_ptr() + newsize
 
@@ -713,15 +713,6 @@ public:
   // detect a change in the byte order, this method will let him
   // change it.
 
-  void reset (const ACE_Message_Block *data,
-              int byte_order);
-  // 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>.
-
   char* rd_ptr (void);
   // Returns the current position for the rd_ptr....
 
diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h
index b6c13abbf2b..c540e5af1f6 100644
--- a/ace/CORBA_macros.h
+++ b/ace/CORBA_macros.h
@@ -385,7 +385,7 @@
 
 // Print out a TAO exception.  This is not CORBA compliant.
 # define ACE_PRINT_TAO_EXCEPTION(EX,INFO) \
-  EX._tao_print_exception (INFO)
+  EX.print_exception (INFO)
 
 // Print out a CORBA exception.  There is not portable way to
 // dump a CORBA exception.  If you are using other ORB implementation,
diff --git a/ace/Cache_Map_Manager_T.cpp b/ace/Cache_Map_Manager_T.cpp
index 0a7cc36ec46..b4b871b47f8 100644
--- a/ace/Cache_Map_Manager_T.cpp
+++ b/ace/Cache_Map_Manager_T.cpp
@@ -20,19 +20,16 @@
 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)
 
-#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 (size_t size,
-                                                   ACE_Allocator *alloc,
-                                                   CACHING_STRATEGY *caching_s,
-                                                   int delete_caching_strategy)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> 
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::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, caching_s, delete_caching_strategy) == -1)
@@ -42,16 +39,16 @@ ACE_Cache_Map_Manager<T_2>::ACE_Cache_Map_Manager (size_t size,
   
 }
 
-template <T_1>
-ACE_Cache_Map_Manager<T_2>::~ACE_Cache_Map_Manager (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES>
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Manager (void)
 {
 }
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::open (size_t length,
-                                  ACE_Allocator *alloc,
-                                  CACHING_STRATEGY *caching_s,
-                                  int delete_caching_strategy)  
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::open (size_t length,
+                                                                                                     ACE_Allocator *alloc,
+                                                                                                     CACHING_STRATEGY *caching_s,
+                                                                                                     int delete_caching_strategy)  
 {
   // Create the map.
   if (this->map_.open (length,
@@ -90,8 +87,8 @@ ACE_Cache_Map_Manager<T_2>::open (size_t length,
   return 0;
 }
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::close (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::close (void)
 {
   if (this->delete_caching_strategy_ == 1)
     delete this->caching_strategy_;
@@ -103,9 +100,9 @@ ACE_Cache_Map_Manager<T_2>::close (void)
   return this->map_.close ();
 }
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::bind (const KEY &key,
-                                  const VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::bind (const KEY &key,
+                                                                                                    const VALUE &value)
 {
   // Insert an entry which has the <key> and the <cache_value> which
   // is the combination of the <value> and the attributes of the
@@ -139,9 +136,9 @@ ACE_Cache_Map_Manager<T_2>::bind (const KEY &key,
 }
 
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
-                                    const VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::rebind (const KEY &key,
+                                                                                                      const VALUE &value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_->attributes ());
@@ -176,10 +173,10 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
 }
 
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
-                                    const VALUE &value,
-                                    VALUE &old_value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::rebind (const KEY &key,
+                                                                                                      const VALUE &value,
+                                                                                                      VALUE &old_value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_->attributes ());
@@ -223,11 +220,11 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
   return rebind_result;
 }
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
-                                    const VALUE &value,
-                                    KEY &old_key,
-                                    VALUE &old_value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::rebind (const KEY &key,
+                                                                                                      const VALUE &value,
+                                                                                                      KEY &old_key,
+                                                                                                      VALUE &old_value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_->attributes ());
@@ -272,9 +269,9 @@ ACE_Cache_Map_Manager<T_2>::rebind (const KEY &key,
   return rebind_result;
 }
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::trybind (const KEY &key,
-                                     VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::trybind (const KEY &key,
+                                                                                                       VALUE &value)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_->attributes ());
@@ -314,9 +311,9 @@ ACE_Cache_Map_Manager<T_2>::trybind (const KEY &key,
   return trybind_result;
 }
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::find (const KEY &key,
-                                  VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::find (const KEY &key,
+                                                                                                    VALUE &value)
 {
   // Lookup the key and populate the <value>.
   CACHE_VALUE cache_value;
@@ -353,8 +350,8 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key,
   return find_result;
 }
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::find (const KEY &key)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::find (const KEY &key)
 {
   // Lookup the key and populate the <value>.
   CACHE_VALUE cache_value;
@@ -391,8 +388,8 @@ ACE_Cache_Map_Manager<T_2>::find (const KEY &key)
 }
 
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::unbind (const KEY &key)
 {
   // Remove the entry from the cache.
   CACHE_VALUE cache_value;
@@ -414,9 +411,9 @@ ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key)
   return unbind_result;
 }
 
-template <T_1> int
-ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key,
-                                    VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::unbind (const KEY &key,
+                                                                                                      VALUE &value)
 {
   // Remove the entry from the cache.
   CACHE_VALUE cache_value;
@@ -441,15 +438,12 @@ ACE_Cache_Map_Manager<T_2>::unbind (const KEY &key,
 }
 
 
-template <T_1> void
-ACE_Cache_Map_Manager<T_2>::dump (void) const
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> void
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::dump (void) const
 {
   this->map_.dump ();
   
   this->caching_strategy_->dump ();
 }
 
-#undef T_1
-#undef T_2
-
 #endif /* ACE_CACHE_MAP_MANAGER_T_C */
diff --git a/ace/Cache_Map_Manager_T.h b/ace/Cache_Map_Manager_T.h
index 2afdf7d326c..c83e61cf031 100644
--- a/ace/Cache_Map_Manager_T.h
+++ b/ace/Cache_Map_Manager_T.h
@@ -28,60 +28,54 @@
 // Forward declaration.
 class ACE_Allocator;
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Iterator;
 
-template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Reverse_Iterator;
 
-template <class KEY, class VALUE, class MAP, class ITERATOR_IMPL, class REVERSE_ITERATOR_IMPL, class CACHING_STRATEGY, class ATTRIBUTES>
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Manager
 {
   // = TITLE
-  //     Defines a abstraction that will purge entries from a map.
-  //
+  //     Defines a abstraction which will purge entries from a map.
+  //   
   // = DESCRIPTION
-  //     The <ACE_Cache_Map_Manager> will manage the map it contains
+  //     The Cache_Map_Manager will manage the map it contains
   //     and provide purging on demand from the map. The strategy for
   //     caching is decided by the user and provided to the Cache
   //     Manager.  The Cache Manager acts as a agent and communicates
   //     between the Map and the Strategy for purging entries from the
-  //     map.
+  //     map. 
   //
   //     No locking mechanism provided since locking at this level
-  //     isn't efficient.  Locking has to be provided by the
+  //     isnt efficient.  Locking has to be provided by the
   //     application.
 public:
 
   // = Traits.
   typedef KEY key_type;
   typedef VALUE mapped_type;
-  typedef MAP map_type;
-  typedef CACHING_STRATEGY caching_strategy_type;
-  typedef ITERATOR_IMPL ITERATOR_IMPLEMENTATION;
-  typedef REVERSE_ITERATOR_IMPL REVERSE_ITERATOR_IMPLEMENTATION;
+  typedef ACE_TYPENAME MAP::ITERATOR IMPLEMENTATION;
+  typedef ACE_TYPENAME MAP::REVERSE_ITERATOR REVERSE_IMPLEMENTATION;
   typedef ACE_Pair<VALUE, ATTRIBUTES> CACHE_VALUE;
   // The actual value mapped to the key in the map. The <attributes>
   // 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, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION,  CACHING_STRATEGY, ATTRIBUTES>;
+  friend class ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION,  CACHING_STRATEGY, ATTRIBUTES>;
 
   // = ACE-style iterator typedefs.
-  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> 
-          REVERSE_ITERATOR;
+  typedef ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> ITERATOR;
+  typedef ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> REVERSE_ITERATOR;
 
    // = STL-style iterator typedefs.
-  typedef ITERATOR 
-          iterator;
-  typedef REVERSE_ITERATOR 
-          reverse_iterator;
+  typedef ITERATOR iterator;
+  typedef REVERSE_ITERATOR reverse_iterator;
 
   // = Initialization and termination methods.
-
+ 
   ACE_Cache_Map_Manager (size_t size = ACE_DEFAULT_MAP_SIZE,
                          ACE_Allocator *alloc = 0,
                          CACHING_STRATEGY *caching_s = 0,
@@ -101,16 +95,16 @@ public:
             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.
 
   int bind (const KEY &key,
             const VALUE &value);
-  // Associate <key> with <value>.  If <key> is already in the MAP
-  // then the ENTRY is not changed.  Returns 0 if a new entry is bound
-  // successfully, returns 1 if an attempt is made to bind an existing
-  // entry, and returns -1 if failures occur.
+  // Associate <key> with <value>.  If <key> is already in the
+  // MAP then the ENTRY is not changed.  Returns 0 if a new entry is
+  // bound successfully, returns 1 if an attempt is made to bind an
+  // existing entry, and returns -1 if failures occur.
 
   int find (const KEY &key,
             VALUE &value);
@@ -140,19 +134,19 @@ public:
               VALUE &old_value);
   // Reassociate <key> with <value>, storing the old key and value
   // into the "out" parameters <old_key> and <old_value>.  The
-  // function fails if <key> is not in the cache for caches that do
-  // not allow user specified keys.  However, for caches that allow
-  // user specified keys, if the key is not in the cache, a new
-  // <key>/<value> association is created.
+  // function fails if <key> is not in the cache for caches that do not
+  // allow user specified keys.  However, for caches that allow user
+  // specified keys, if the key is not in the cache, a new <key>/<value>
+  // association is created.
 
   int trybind (const KEY &key,
                VALUE &value);
   // Associate <key> with <value> if and only if <key> is not in the
-  // cache.  If <key> is already in the cache, then the <value>
-  // parameter is overwritten with the existing value in the
-  // cache. Returns 0 if a new <key>/<value> association is created.
-  // Returns 1 if an attempt is made to bind an existing entry.  This
-  // function fails for maps that do not allow user specified keys.
+  // cache.  If <key> is already in the cache, then the <value> parameter
+  // is overwritten with the existing value in the cache. Returns 0 if a
+  // new <key>/<value> association is created.  Returns 1 if an
+  // attempt is made to bind an existing entry.  This function fails
+  // for maps that do not allow user specified keys.
 
   int unbind (const KEY &key);
   // Remove <key> from the cache.
@@ -162,7 +156,7 @@ public:
   // Remove <key> from the cache, and return the <value> associated with
   // <key>.
 
-  int purge (void);
+  int purge (MAP &map);
   // Remove entries from the cache depending upon the strategy.
 
   size_t current_size (void);
@@ -203,7 +197,8 @@ protected:
   // class or not. Is yes, then it deletes the strategy.
 };
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
+////////////////////////////////////////////////////////////////////////////////
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Iterator
 {
   // = TITLE
@@ -216,29 +211,27 @@ class ACE_Cache_Map_Iterator
 public:
 
   // = Traits.
-  typedef ACE_Reference_Pair<KEY, VALUE> 
-          value_type;
-  typedef ACE_Pair <VALUE, ATTRIBUTES> 
-          CACHE_VALUE;
+  typedef ACE_Reference_Pair<KEY, VALUE> value_type; 
+  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.
-
+ 
   // = Initialisation and termination methods.
 
   ACE_Cache_Map_Iterator (const IMPLEMENTATION &iterator_impl);
 
-  ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
+  ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
   // Copy constructor.
 
   virtual ~ACE_Cache_Map_Iterator (void);
 
   // = Iteration methods.
 
-  ACE_Cache_Map_Iterator &operator= (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
+  ACE_Cache_Map_Iterator &operator= (const ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
   // assignment operator.
 
-  int operator== (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
-  int operator!= (const ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
+  int operator== (const ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
+  int operator!= (const ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
   // Comparision operators.
 
   ACE_Reference_Pair<KEY, VALUE> operator* (void) const;
@@ -247,16 +240,16 @@ public:
 
   // = STL styled iteration, compare, and reference functions.
 
-  ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (void);
+  ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (void);
   // Prefix advance
 
-  ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator++ (int);
+  ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator++ (int);
   // Postfix advance.
 
-  ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (void);
+  ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (void);
   // Prefix reverse.
 
-  ACE_Cache_Map_Iterator<KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator-- (int);
+  ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator-- (int);
   // Postfix reverse.
 
   IMPLEMENTATION &iterator_implementation (void);
@@ -275,7 +268,8 @@ protected:
   // belonging to the Cache_Map_Manager.
 };
 
-template <class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
+////////////////////////////////////////////////////////////////////////////////
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES>
 class ACE_Cache_Map_Reverse_Iterator
 {
   // = TITLE
@@ -284,6 +278,7 @@ class ACE_Cache_Map_Reverse_Iterator
   // = DESCRIPTION
   //     Implementation to be provided by the reverse iterator of the map
   //     managed by thr Cache_Map_manager.
+
 public:
 
   // = Traits.
@@ -296,18 +291,18 @@ public:
 
   ACE_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl);
 
-  ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
+  ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
   // Copy constructor.
 
   ~ACE_Cache_Map_Reverse_Iterator (void);
 
   // = Iteration methods.
 
-  ACE_Cache_Map_Reverse_Iterator &operator= (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
+  ACE_Cache_Map_Reverse_Iterator &operator= (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs);
   // Assignment operator.
 
-  int operator== (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
-  int operator!= (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
+  int operator== (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
+  int operator!= (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const;
   // Comparision operators.
 
   ACE_Reference_Pair<KEY, VALUE> operator* (void) const;
@@ -316,19 +311,19 @@ public:
 
   // = STL styled iteration, compare, and reference functions.
 
-  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (void);
+  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator++ (void);
   // Prefix advance
 
-  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator++ (int);
+  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator++ (int);
   // Postfix advance.
 
-  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (void);
+  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &operator-- (void);
   // Prefix reverse.
 
-  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator-- (int);
+  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> operator-- (int);
   // Postfix reverse.
 
-  REVERSE_IMPLEMENTATION &iterator_implementation (void);
+  REVERSE_IMPLEMENTATION &iterator_implementation (void); 
   // Returns the iterator of the internal map in the custody of the
   // Cache_Map_Manager.
 
diff --git a/ace/Cache_Map_Manager_T.i b/ace/Cache_Map_Manager_T.i
index 421aa8d1c73..92dced59904 100644
--- a/ace/Cache_Map_Manager_T.i
+++ b/ace/Cache_Map_Manager_T.i
@@ -1,259 +1,239 @@
 /* -*- C++ -*- */
 //$Id$
 
-#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_INLINE int
-ACE_Cache_Map_Manager<T_2>::purge (MAP &map)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::purge (MAP &map)
 {
   return this->caching_strategy ()->clear_cache (map);
 }
 
-template <T_1> ACE_INLINE size_t
-ACE_Cache_Map_Manager<T_2>::current_size (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE size_t
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::current_size (void)
 {
   return this->map_.current_size ();
 }
 
-template <T_1> ACE_INLINE size_t
-ACE_Cache_Map_Manager<T_2>::total_size (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE size_t
+ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::total_size (void)
 {
   return this->map_.total_size ();
 }
 
-template <T_1> ACE_INLINE MAP &
-ACE_Cache_Map_Manager<T_2>::map (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE MAP &
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::map (void)
 {
   return this->map_;
 }
 
-template <T_1> ACE_INLINE CACHING_STRATEGY *
-ACE_Cache_Map_Manager<T_2>::caching_strategy (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE CACHING_STRATEGY *
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::caching_strategy (void)
 {
   return this->caching_strategy_;
 }
 
-template <T_1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<T_2>::begin (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::ITERATOR
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::begin (void)
 {
-  return ITERATOR (this->map_.begin ());
+  return ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::ITERATOR (this->map_.begin ());
 }
 
-template <T_1> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<T_2>::end (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE  ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::ITERATOR
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::end (void)
 {
-  return ITERATOR (this->map_.end ());
+  return ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::ITERATOR (this->map_.end ());
 }
 
-template <T_1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<T_2>::rbegin (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE  ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::REVERSE_ITERATOR
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::rbegin (void)
 {
-  return REVERSE_ITERATOR (this->map_.rbegin ());
+  return ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::REVERSE_ITERATOR (this->map_.rbegin ());
 }
-template <T_1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, REVERSE_ITERATOR_IMPL, CACHING_STRATEGY, ATTRIBUTES>
-ACE_Cache_Map_Manager<T_2>::rend (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class MAP, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::REVERSE_ITERATOR
+ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::rend (void)
 {
-  return REVERSE_ITERATOR (this->map_.rend ());
+  return ACE_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, MAP, CACHING_STRATEGY, ATTRIBUTES>::REVERSE_ITERATOR (this->map_.rend ());
 }
 
-#undef T_1
-#undef T_2
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define T_1 class KEY, class VALUE, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
-#define T_2 KEY, VALUE, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
-
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Iterator<T_2>::ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator <T_2> &rhs)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::ACE_Cache_Map_Iterator (const ACE_Cache_Map_Iterator <KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs)
  : iterator_implementation_ (rhs.iterator_implementation_)
 {
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Iterator<T_2>::~ACE_Cache_Map_Iterator (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Iterator (void)
 {
 }
 
-template <T_1> ACE_INLINE ACE_Cache_Map_Iterator<T_2> &
-ACE_Cache_Map_Iterator<T_2>::operator= (const ACE_Cache_Map_Iterator<T_2> &rhs)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator= (const ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs)
 {
   this->iterator_implementation_ = rhs.iterator_implementation_;
   return *this;
 }
 
-template <T_1> ACE_INLINE int
-ACE_Cache_Map_Iterator<T_2>::operator== (const ACE_Cache_Map_Iterator<T_2> &rhs) const
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator== (const ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const
 {
   return this->iterator_implementation_ == rhs.iterator_implementation_;
 }
 
-template <T_1> ACE_INLINE int
-ACE_Cache_Map_Iterator<T_2>::operator!= (const ACE_Cache_Map_Iterator<T_2> &rhs) const
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator!= (const ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const
 {
   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
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* (void) const
 {
-  value_type retn ((*this->iterator_implementation_).ext_id_, 
-                   (*this->iterator_implementation_).int_id_.first ());
+  value_type retn ((*this->iterator_implementation_).ext_id_, (*this->iterator_implementation_).int_id_.first ());
   return retn;
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Iterator<T_2> &
-ACE_Cache_Map_Iterator<T_2>::operator++ (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator++ (void)
 {
   ++this->iterator_implementation_;
   return *this;
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Iterator<T_2>
-ACE_Cache_Map_Iterator<T_2>::operator++ (int)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator++ (int)
 {
-  ACE_Cache_Map_Iterator<T_2> retn = *this;
+  ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> retn = *this;
   ++this->iterator_implementation_;
   return retn;
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Iterator<T_2> &
-ACE_Cache_Map_Iterator<T_2>::operator-- (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator-- (void)
 {
   --this->iterator_implementation_;
   return *this;
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Iterator<T_2>
-ACE_Cache_Map_Iterator<T_2>::operator-- (int)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator-- (int)
 {
-  ACE_Cache_Map_Iterator<T_2> retn = *this;
+  ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> retn = *this;
   --this->iterator_implementation_;
   return retn;
 }
 
 
-template <T_1> ACE_INLINE void
-ACE_Cache_Map_Iterator<T_2>::dump (void) const
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE void
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::dump (void) const
 {
-  this->iterator_implementation_.dump ();
+  return this->iterator_implementation_.dump ();
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Iterator<T_2>::ACE_Cache_Map_Iterator (const IMPLEMENTATION &iterator_impl)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::ACE_Cache_Map_Iterator (const IMPLEMENTATION &iterator_impl)
  : iterator_implementation_ (iterator_impl)
 {
 }
 
-template <T_1> ACE_INLINE IMPLEMENTATION &
-ACE_Cache_Map_Iterator<T_2>::iterator_implementation (void) 
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE IMPLEMENTATION &
+ACE_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::iterator_implementation (void) 
 {
   return this->iterator_implementation_;
 }
 
-#undef T_1
-#undef T_2
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define T_1 class KEY, class VALUE, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES
-#define T_2 KEY, VALUE, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES
-
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<T_2>::ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator <T_2> &rhs)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::ACE_Cache_Map_Reverse_Iterator (const ACE_Cache_Map_Reverse_Iterator <KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs)
  : reverse_iterator_implementation_ (rhs.reverse_iterator_implementation_)
 {
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<T_2>::~ACE_Cache_Map_Reverse_Iterator (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Cache_Map_Reverse_Iterator (void)
 {
 }
 
-template <T_1> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<T_2> &
-ACE_Cache_Map_Reverse_Iterator<T_2>::operator= (const ACE_Cache_Map_Reverse_Iterator<T_2> &rhs)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator= (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs)
 {
   this->reverse_iterator_implementation_ = rhs.reverse_iterator_implementation_;
   return *this;
 }
 
-template <T_1> ACE_INLINE int
-ACE_Cache_Map_Reverse_Iterator<T_2>::operator== (const ACE_Cache_Map_Reverse_Iterator<T_2> &rhs) const
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator== (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const
 {
   return this->reverse_iterator_implementation_ == rhs.reverse_iterator_implementation_;
 }
 
-template <T_1> ACE_INLINE int
-ACE_Cache_Map_Reverse_Iterator<T_2>::operator!= (const ACE_Cache_Map_Reverse_Iterator<T_2> &rhs) const
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator!= (const ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &rhs) const
 {
   return this->reverse_iterator_implementation_ != rhs.reverse_iterator_implementation_;
 }
 
-template <T_1> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
-ACE_Cache_Map_Reverse_Iterator<T_2>::operator* (void) const
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator* (void) const
 {
-  value_type retv ((*this->reverse_iterator_implementation_).ext_id_, 
-                   (*this->reverse_iterator_implementation_).int_id_.first ());
+  value_type retv ((*this->reverse_iterator_implementation_).ext_id_, (*this->reverse_iterator_implementation_).int_id_.first ());
   return retv;
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<T_2> &
-ACE_Cache_Map_Reverse_Iterator<T_2>::operator++ (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator++ (void)
 {
   ++this->reverse_iterator_implementation_;
   return *this;
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<T_2>
-ACE_Cache_Map_Reverse_Iterator<T_2>::operator++ (int)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator++ (int)
 {
-  ACE_Cache_Map_Reverse_Iterator<T_2> retn = *this;
+  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> retn = *this;
   ++this->reverse_iterator_implementation_;
   return retn;
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<T_2> &
-ACE_Cache_Map_Reverse_Iterator<T_2>::operator-- (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> &
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator-- (void)
 {
   --this->reverse_iterator_implementation_;
   return *this;
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<T_2>
-ACE_Cache_Map_Reverse_Iterator<T_2>::operator-- (int)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::operator-- (int)
 {
-  ACE_Cache_Map_Reverse_Iterator<T_2> retn = *this;
+  ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES> retn = *this;
   --this->reverse_iterator_implementation_;
   return retn;
 }
 
 
-template <T_1> ACE_INLINE void
-ACE_Cache_Map_Reverse_Iterator<T_2>::dump (void) const
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE void
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::dump (void) const
 {
-  this->reverse_iterator_implementation_.dump ();
+  return this->reverse_iterator_implementation_.dump ();
 }
 
-template <T_1> ACE_INLINE
-ACE_Cache_Map_Reverse_Iterator<T_2>::ACE_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::ACE_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl)
  : reverse_iterator_implementation_(iterator_impl)
 {
 }
 
-template <T_1> ACE_INLINE REVERSE_IMPLEMENTATION &
-ACE_Cache_Map_Reverse_Iterator<T_2>::iterator_implementation (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class REVERSE_IMPLEMENTATION, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE REVERSE_IMPLEMENTATION &
+ACE_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, REVERSE_IMPLEMENTATION, CACHING_STRATEGY, ATTRIBUTES>::iterator_implementation (void)
 {
   return this->reverse_iterator_implementation_;
 }
-
-#undef T_1
-#undef T_2
diff --git a/ace/Cached_Connect_Strategy_T.h b/ace/Cached_Connect_Strategy_T.h
index db42f9258b2..4a6263faed7 100644
--- a/ace/Cached_Connect_Strategy_T.h
+++ b/ace/Cached_Connect_Strategy_T.h
@@ -79,7 +79,7 @@ public:
   // = Typedefs for managing the map
   typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>
           REFCOUNTED_HASH_RECYCLABLE_ADDRESS;
-  typedef ACE_TYPENAME CACHING_STRATEGY::CACHING_ATTRIBUTES ATTRIBUTES;
+  typedef ACE_TYPENAME CACHING_STRATEGY::ATTRIBUTES ATTRIBUTES;
   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 
@@ -92,7 +92,7 @@ public:
           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> >
+  typedef ACE_Svc_Cleanup_Strategy<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; 
 
 protected:
@@ -110,7 +110,6 @@ protected:
   // Cleanup hint.
 
   // = Helpers
-
   int check_hint_i (SVC_HANDLER *&sh,
                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                     ACE_Time_Value *timeout,
@@ -121,7 +120,15 @@ protected:
                     ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::CONNECTION_CACHE_ENTRY *&entry,
                     int &found);
 
- 
+  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,
+                             int reuse_addr,
+                             int flags,
+                             int perms,
+                             int &found);
+
   int find_or_create_svc_handler_i (SVC_HANDLER *&sh,
                                     const ACE_PEER_CONNECTOR_ADDR &remote_addr,
                                     ACE_Time_Value *timeout,
@@ -132,15 +139,6 @@ protected:
                                     ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::CONNECTION_CACHE_ENTRY *&entry,
                                     int &found);
 
-  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,
-                             int reuse_addr,
-                             int flags,
-                             int perms,
-                             int &found);
-
   CONNECTION_CACHE connection_cache_;
   // Table that maintains the cache of connected <SVC_HANDLER>s.
 
diff --git a/ace/Caching_Strategies_T.cpp b/ace/Caching_Strategies_T.cpp
index 72d5e1ab953..ad5821b81d0 100644
--- a/ace/Caching_Strategies_T.cpp
+++ b/ace/Caching_Strategies_T.cpp
@@ -15,44 +15,30 @@
 
 ACE_RCSID(ace, Caching_Strategies_T, "$Id$")
 
-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,
-                                                                                                                 int delete_caching_strategy_utility)
+template<class CONTAINER> 
+ACE_LRU_Caching_Strategy<CONTAINER>::ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                                                               int delete_cleanup_strategy)
   : timer_ (0),
     purge_percent_ (10),
     entries_ (0),
     cleanup_strategy_ (0),
-    delete_cleanup_strategy_ (1),
-    caching_strategy_utility_ (0),
-    delete_caching_strategy_utility_ (1)
+    delete_cleanup_strategy_ (1)
 {
-  if (this->open (cleanup_s,
-                  delete_cleanup_strategy,
-                  utility_s,
-                  delete_caching_strategy_utility) == -1)
+  if (this->open (cleanup_s, delete_cleanup_strategy) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
                 ASYS_TEXT ("ACE_LRU_Caching_Strategy::ACE_LRU_Caching_Strategy")));
-
+  
 }
 
-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 (void)
+template<class CONTAINER> 
+ACE_LRU_Caching_Strategy<CONTAINER>::~ACE_LRU_Caching_Strategy (void)
 {
-  if (this->delete_cleanup_strategy_ == 1)
-    delete this->cleanup_strategy_;
-
-  if (this->delete_caching_strategy_utility_ == 1)
-    delete this->caching_strategy_utility_;
 }
 
-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>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                             int delete_cleanup_strategy,
-                                                                                             CACHING_STRATEGY_UTILITY *utility_s,
-                                                                                             int delete_caching_strategy_utility)
+template<class CONTAINER> int 
+ACE_LRU_Caching_Strategy<CONTAINER>::open (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                                           int delete_cleanup_strategy)
 {
   // Initialise the cleanup strategy.
 
@@ -60,103 +46,67 @@ ACE_LRU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
   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_ = delete_cleanup_strategy;
+
     }
 
   if (cleanup_s != 0)
     this->cleanup_strategy_ = cleanup_s;
   else if (this->cleanup_strategy_ == 0)
     {
+
       ACE_NEW_RETURN (this->cleanup_strategy_,
                       CLEANUP_STRATEGY,
                       -1);
 
       this->delete_cleanup_strategy_ = delete_cleanup_strategy;
-    }
 
-  // Initialise the caching strategy utility.
-
-  // First we decide whether we need to clean up.
-  if (this->caching_strategy_utility_ != 0 &&
-      this->delete_caching_strategy_utility_ == 1 &&
-      utility_s != 0)
-    {
-      delete this->caching_strategy_utility_;
-      this->caching_strategy_utility_ = 0;
-      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
     }
-
-  if (utility_s != 0)
-    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_ = delete_caching_strategy_utility;
-    }
-
-  return 0;
+    
+  return 0;  
 }
 
-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)
+template<class CONTAINER> int
+ACE_LRU_Caching_Strategy<CONTAINER>::clear_cache (CONTAINER &container)
 {
-  return this->caching_strategy_utility_->clear_cache (container,
-                                                       this->cleanup_strategy_,
-                                                       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);
+  return this->caching_strategy_utility_.clear_cache (container,
+                                                      this->cleanup_strategy_,
+                                                      this->purge_percent_,
+                                                      this->entries_);
 }
-
+  
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-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 (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                                                 int delete_cleanup_strategy,
-                                                                                                                 CACHING_STRATEGY_UTILITY *utility_s,
-                                                                                                                 int delete_caching_strategy_utility)
+template<class CONTAINER> 
+ACE_LFU_Caching_Strategy<CONTAINER>::ACE_LFU_Caching_Strategy (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                                                               int delete_cleanup_strategy)
   : purge_percent_ (10),
     entries_ (0),
     cleanup_strategy_ (0),
-    delete_cleanup_strategy_ (1),
-    caching_strategy_utility_ (0),
-    delete_caching_strategy_utility_ (1)
+    delete_cleanup_strategy_ (1)
 {
-  if (this->open (cleanup_s,
-                  delete_cleanup_strategy,
-                  utility_s,
-                  delete_caching_strategy_utility) == -1)
+  if (this->open (cleanup_s, delete_cleanup_strategy) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
                 ASYS_TEXT ("ACE_LFU_Caching_Strategy::ACE_LFU_Caching_Strategy")));
-
+  
 }
 
-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)
+template<class CONTAINER> 
+ACE_LFU_Caching_Strategy<CONTAINER>::~ACE_LFU_Caching_Strategy (void)
 {
 }
 
-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>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                             int delete_cleanup_strategy,
-                                                                                             CACHING_STRATEGY_UTILITY *utility_s,
-                                                                                             int delete_caching_strategy_utility)
+template<class CONTAINER> int 
+ACE_LFU_Caching_Strategy<CONTAINER>::open (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                                           int delete_cleanup_strategy)
 {
   // Initialise the cleanup strategy.
 
@@ -165,102 +115,67 @@ ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTI
       this->delete_cleanup_strategy_ == 1 &&
       cleanup_s != 0)
     {
+
       delete this->cleanup_strategy_;
+
       this->cleanup_strategy_ = 0;
+
       this->delete_cleanup_strategy_ = delete_cleanup_strategy;
+
     }
 
   if (cleanup_s != 0)
     this->cleanup_strategy_ = cleanup_s;
   else if (this->cleanup_strategy_ == 0)
     {
+
       ACE_NEW_RETURN (this->cleanup_strategy_,
                       CLEANUP_STRATEGY,
                       -1);
 
       this->delete_cleanup_strategy_ = delete_cleanup_strategy;
-    }
-
-  // Initialise the caching strategy utility.
-
-  // First we decide whether we need to clean up.
-  if (this->caching_strategy_utility_ != 0 &&
-      this->delete_caching_strategy_utility_ == 1 &&
-      utility_s != 0)
-    {
-      delete this->caching_strategy_utility_;
-      this->caching_strategy_utility_ = 0;
-      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
-    }
 
-  if (utility_s != 0)
-    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_ = delete_caching_strategy_utility;
     }
-
+    
   return 0;
 }
 
-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)
+template<class CONTAINER> int
+ACE_LFU_Caching_Strategy<CONTAINER>::clear_cache (CONTAINER &container)
 {
-  return this->caching_strategy_utility_->clear_cache (container,
-                                                       this->cleanup_strategy_,
-                                                       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);
+  return this->caching_strategy_utility_.clear_cache (container,
+                                                      this->cleanup_strategy_,
+                                                      this->purge_percent_,
+                                                      this->entries_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_FIFO_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                                                   int delete_cleanup_strategy,
-                                                                                                                   CACHING_STRATEGY_UTILITY *utility_s,
-                                                                                                                   int delete_caching_strategy_utility)
+template<class CONTAINER> 
+ACE_FIFO_Caching_Strategy<CONTAINER>::ACE_FIFO_Caching_Strategy (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                                                                 int delete_cleanup_strategy)
   : order_ (0),
     purge_percent_ (10),
     entries_ (0),
     cleanup_strategy_ (0),
-    delete_cleanup_strategy_ (1),
-    caching_strategy_utility_ (0),
-    delete_caching_strategy_utility_ (1)
+    delete_cleanup_strategy_ (1)
 {
-  if (this->open (cleanup_s,
-                  delete_cleanup_strategy,
-                  utility_s,
-                  delete_caching_strategy_utility) == -1)
+  if (this->open (cleanup_s, delete_cleanup_strategy) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("%p\n"),
                 ASYS_TEXT ("ACE_FIFO_Caching_Strategy::ACE_FIFO_Caching_Strategy")));
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_FIFO_Caching_Strategy (void)
+template<class CONTAINER> 
+ACE_FIFO_Caching_Strategy<CONTAINER>::~ACE_FIFO_Caching_Strategy (void)
 
 {
 }
 
-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>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                              int delete_cleanup_strategy,
-                                                                                              CACHING_STRATEGY_UTILITY *utility_s,
-                                                                                              int delete_caching_strategy_utility)
+template<class CONTAINER> int 
+ACE_FIFO_Caching_Strategy<CONTAINER>::open (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                                           int delete_cleanup_strategy)
 {
   // Initialise the cleanup strategy.
 
@@ -269,116 +184,68 @@ ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UT
       this->delete_cleanup_strategy_ == 1 &&
       cleanup_s != 0)
     {
+
       delete this->cleanup_strategy_;
+
       this->cleanup_strategy_ = 0;
+
       this->delete_cleanup_strategy_ = delete_cleanup_strategy;
+
     }
 
   if (cleanup_s != 0)
     this->cleanup_strategy_ = cleanup_s;
   else if (this->cleanup_strategy_ == 0)
     {
+
       ACE_NEW_RETURN (this->cleanup_strategy_,
-                      CLEANUP_STRATEGY,
+                      CLEANUP_STRATEGY, 
                       -1);
 
       this->delete_cleanup_strategy_ = delete_cleanup_strategy;
-    }
-
-  // Initialise the caching strategy utility.
 
-  // First we decide whether we need to clean up.
-  if (this->caching_strategy_utility_ != 0 &&
-      this->delete_caching_strategy_utility_ == 1 &&
-      utility_s != 0)
-    {
-      delete this->caching_strategy_utility_;
-      this->caching_strategy_utility_ = 0;
-      this->delete_caching_strategy_utility_ = delete_caching_strategy_utility;
     }
+    
+  return 0;  
+}
 
-  if (utility_s != 0)
-    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_ = delete_caching_strategy_utility;
-    }
 
-  return 0;
-}
 
-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)
+template<class CONTAINER> int
+ACE_FIFO_Caching_Strategy<CONTAINER>::clear_cache (CONTAINER &container)
 {
-  return this->caching_strategy_utility_->clear_cache (container,
-                                                       this->cleanup_strategy_,
-                                                       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);
+  return this->caching_strategy_utility_.clear_cache (container,
+                                                      this->cleanup_strategy_,
+                                                      this->purge_percent_,
+                                                      this->entries_);
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
-ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::ACE_Null_Caching_Strategy (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                                                   int delete_cleanup_strategy,
-                                                                                                                   CACHING_STRATEGY_UTILITY *utility_s,
-                                                                                                                   int delete_caching_strategy_utility)
+template<class CONTAINER>  
+ACE_Null_Caching_Strategy<CONTAINER>::ACE_Null_Caching_Strategy (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                                                                 int delete_cleanup_strategy)
 {
-  ACE_UNUSED_ARG (cleanup_s);
-  ACE_UNUSED_ARG (delete_cleanup_strategy);
-  ACE_UNUSED_ARG (utility_s);
-  ACE_UNUSED_ARG (delete_caching_strategy_utility);
 }
 
-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>::open (ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_s,
-                                                                                              int delete_cleanup_strategy,
-                                                                                              CACHING_STRATEGY_UTILITY *utility_s,
-                                                                                              int delete_caching_strategy_utility)
+template<class CONTAINER> int 
+ACE_Null_Caching_Strategy<CONTAINER>::open (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                                            int delete_cleanup_strategy)
 {
-  ACE_UNUSED_ARG (cleanup_s);
-  ACE_UNUSED_ARG (delete_cleanup_strategy);
-  ACE_UNUSED_ARG (utility_s);
-  ACE_UNUSED_ARG (delete_caching_strategy_utility);
-  
-  return 0;
 }
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
-ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::~ACE_Null_Caching_Strategy (void)
+template<class CONTAINER> 
+ACE_Null_Caching_Strategy<CONTAINER>::~ACE_Null_Caching_Strategy (void)
 {
 }
 
-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)
+template<class CONTAINER> int
+ACE_Null_Caching_Strategy<CONTAINER>::clear_cache (CONTAINER &container)
 {
-  ACE_UNUSED_ARG (container);
-
-  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;
 }
 
@@ -388,5 +255,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_LRU_Caching_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_LFU_Caching_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Caching_Strategy)
 ACE_ALLOC_HOOK_DEFINE(ACE_Null_Caching_Strategy)
-
 #endif /* CACHING_STRATEGIES_T_C */
+
+
+
diff --git a/ace/Caching_Strategies_T.h b/ace/Caching_Strategies_T.h
index 8e7db943ba7..686c5331d9e 100644
--- a/ace/Caching_Strategies_T.h
+++ b/ace/Caching_Strategies_T.h
@@ -27,7 +27,7 @@
 
 #include "ace/Cleanup_Strategies_T.h"
 
-template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+template <class CONTAINER>
 class ACE_LRU_Caching_Strategy
 {
   // = TITLE
@@ -39,28 +39,17 @@ 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
-  //     and should logically be included with the VALUE. Some ways of
-  //     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. 
 
 public:
 
   // Traits.
-  typedef ATTRIBUTES CACHING_ATTRIBUTES;
+  typedef int ATTRIBUTES;
   typedef CONTAINER CACHE;
  
   // = Initialisation and termination.
 
-  ACE_LRU_Caching_Strategy (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);
+  ACE_LRU_Caching_Strategy (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s = 0,
+                            int delete_cleanup_strategy = 1);
   // The <container> is the map in which the entries reside.
   // The Cleanup_Strategy is the callback class to which the entries
   // to be cleaned up will be delegated. The <delete_cleanup_strategy>
@@ -68,29 +57,23 @@ public:
   // Also, the timer attribute is initialed to zero in this constructor.
   // And the <purge_percent> field denotes the percentage of the entries
   // 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 
-  // <delete_caching_strategy_utility> decides whether to destroy the
-  // utility object or not.
+  // set to 10%.
 
   ~ACE_LRU_Caching_Strategy (void);
 
   // = Operations of the strategy.
 
-  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);
+  int open (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 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.
-  unsigned int purge_percent (void);
+  int purge_percent (void);
   
-  void purge_percent (unsigned int percentage);
+  void purge_percent (int percentage);
 
   // =  Strategy related Operations
 
@@ -124,20 +107,12 @@ 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;
+  typedef ACE_Default_Cleanup_Strategy<CONTAINER> CLEANUP_STRATEGY;
 
   ATTRIBUTES timer_;
   // This element is the one which is the deciding factor for purging
@@ -149,7 +124,7 @@ private:
   unsigned int entries_;
   // The no of entries bound in the cache.
   
-  ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
+  ACE_Cleanup_Strategy<CONTAINER> *cleanup_strategy_;
   // The cleanup strategy which can be used to destroy the entries of
   // the container.
 
@@ -157,20 +132,15 @@ private:
   // The flag which denotes the ownership of the cleanup strategy.
   // If 1 then this class itself will destroy the strategy.
 
-  CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
+  ACE_Caching_Strategy_Utility<CONTAINER, ATTRIBUTES> 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
-  // destroy the strategy utility object.
 
 };
 
 //////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+template <class CONTAINER>
 class ACE_LFU_Caching_Strategy
 {
   // = TITLE
@@ -182,28 +152,15 @@ class ACE_LFU_Caching_Strategy
   //     the item is bound or looked up in the cache. Thus it denotes
   //     the frequency of use. According to the value of the attribute
   //     the item is removed from the CONTAINER i.e cache.
-  //
-  //     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
-  //     and should logically be included with the VALUE. Some ways of
-  //     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. 
-
 public:
 
   // Traits.
-  typedef ATTRIBUTES CACHING_ATTRIBUTES;
-  typedef CONTAINER CACHE;
+  typedef int ATTRIBUTES;
 
   // = Initialisation and termination methods.
 
-  ACE_LFU_Caching_Strategy (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);
+  ACE_LFU_Caching_Strategy (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s = 0,
+                            int delete_cleanup_strategy = 1);
   // The <container> is the map in which the entries reside.
   // The Cleanup_Strategy is the callback class to which the entries
   // to be cleaned up will be delegated. The <delete_cleanup_strategy>
@@ -211,18 +168,12 @@ public:
   // Also, the timer attribute is initialed to zero in this constructor.
   // And the <purge_percent> field denotes the percentage of the entries
   // 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 will be default be the
-  // ACE_Caching_Strategy_Utility and the
-  // <delete_caching_strategy_utility> decides whether to destroy the
-  // utility or not.
+  // set to 10%.
 
   ~ACE_LFU_Caching_Strategy (void);
 
-  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);
+  int open (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1);
   // This method which does the actual initialisation.
 
   // = Strategy methods.
@@ -231,9 +182,9 @@ public:
   // Access the attributes.
 
   // = Accessor methods for the percentage of entries to purge.
-  unsigned int purge_percent (void);
+  int purge_percent (void);
   
-  void purge_percent (unsigned int percentage);
+  void purge_percent (int percentage);
 
   // =  Strategy related Operations
   
@@ -266,28 +217,20 @@ 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;
- 
+  typedef ACE_Default_Cleanup_Strategy<CONTAINER> CLEANUP_STRATEGY;
+  
   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_;
+  ACE_Cleanup_Strategy<CONTAINER> *cleanup_strategy_;
   // The cleanup strategy which can be used to destroy the entries of
   // the container.
 
@@ -295,49 +238,32 @@ private:
   // The flag which denotes the ownership of the cleanup strategy.
   // If 1 then this class itself will destroy the strategy.
 
-  CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
+  ACE_Caching_Strategy_Utility<CONTAINER, ATTRIBUTES> 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
-  // destroy the strategy utility object.
 };
 
 /////////////////////////////////////////////////////////////
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+template<class CONTAINER>
 class ACE_FIFO_Caching_Strategy
 {
   // = TITLE
-  //     The First In First Out strategy is implemented wherein each
-  //     item is ordered.
+  //    The First In First Out strategy is implemented wherein each
+  //    item is ordered.
   //
   // = DESCRIPTION
-  //     The order tag of each item is used to decide the item to be
-  //     removed from the cache. The items with least order 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
-  //     and should logically be included with the VALUE. Some ways of
-  //     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. 
-
+  //    The order tag of each item is used to decide the item to be
+  //    removed from the cache. The items with least order are removed.
 public:
 
-  typedef ATTRIBUTES CACHING_ATTRIBUTES;
-  typedef CONTAINER CACHE;
+  typedef int ATTRIBUTES;
 
   // = Initialisation and termination.
 
-  ACE_FIFO_Caching_Strategy (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);
+  ACE_FIFO_Caching_Strategy (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s = 0,
+                             int delete_cleanup_strategy = 1);
   // The <container> is the map in which the entries reside.
   // The Cleanup_Strategy is the callback class to which the entries
   // to be cleaned up will be delegated. The <delete_cleanup_strategy>
@@ -345,18 +271,12 @@ public:
   // Also, the timer attribute is initialed to zero in this constructor.
   // And the <purge_percent> field denotes the percentage of the entries
   // 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 will be default be the
-  // ACE_Caching_Strategy_Utility and the
-  // <delete_caching_strategy_utility> decides whether to destroy the
-  // utility or not. 
+  // set to 10%.
   
   ~ACE_FIFO_Caching_Strategy (void);
 
-  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);
+  int open (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1);
   // This method which does the actual initialisation.
 
   // = Strategy methods.
@@ -365,9 +285,9 @@ public:
   // Accessor method.
 
   // = Accessor methods for the percentage of entries to purge.
-  unsigned int purge_percent (void);
+  int purge_percent (void);
   
-  void purge_percent (unsigned int percentage);
+  void purge_percent (int percentage);
 
   // =  Strategy related Operations
 
@@ -398,21 +318,13 @@ 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;
- 
+  typedef ACE_Default_Cleanup_Strategy<CONTAINER> CLEANUP_STRATEGY;
+
   ATTRIBUTES order_;
   // The order is the deciding factor for the item to be removed from
   // the cache.
@@ -423,7 +335,7 @@ private:
   unsigned int entries_;
   // The no of entries bound in the cache.
  
-  ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER> *cleanup_strategy_;
+  ACE_Cleanup_Strategy<CONTAINER> *cleanup_strategy_;
   // The cleanup strategy which can be used to destroy the entries of
   // the container.
 
@@ -431,18 +343,12 @@ private:
   // The flag which denotes the ownership of the cleanup strategy.
   // If 1 then this class itself will destroy the strategy.
 
-  CACHING_STRATEGY_UTILITY *caching_strategy_utility_;
+  ACE_Caching_Strategy_Utility<CONTAINER, ATTRIBUTES> 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
-  // destroy the strategy utility object.
-
 };
 
-template<class KEY, class VALUE, class CONTAINER, class ATTRIBUTES, class CACHING_STRATEGY_UTILITY>
+template<class CONTAINER>
 class ACE_Null_Caching_Strategy
 {
   // = TITLE
@@ -455,24 +361,18 @@ class ACE_Null_Caching_Strategy
 
 public:
 
-  // = Traits.
-  typedef ATTRIBUTES CACHING_ATTRIBUTES;
-  typedef CONTAINER CACHE;
+  typedef int ATTRIBUTES;
 
   // = Initialisation and termination.
 
-  ACE_Null_Caching_Strategy (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);
+  ACE_Null_Caching_Strategy (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s = 0,
+                             int delete_cleanup_strategy = 1);
 
   ~ACE_Null_Caching_Strategy (void);
 
 
-  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);
+  int open (ACE_Cleanup_Strategy<CONTAINER> *cleanup_s = 0,
+            int delete_cleanup_strategy = 1);
   // This method which does the actual initialisation.
 
   // = Strategy methods. All are NO_OP methods!!!
@@ -481,9 +381,9 @@ public:
   // Accessor method.
 
  // = Accessor methods for the percentage of entries to purge.
-  unsigned int purge_percent (void);
+  int purge_percent (void);
   
-  void purge_percent (unsigned int percentage);
+  void purge_percent (int percentage);
 
   // =  Strategy related Operations
 
@@ -514,14 +414,6 @@ 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.
   
diff --git a/ace/Caching_Strategies_T.i b/ace/Caching_Strategies_T.i
index eacd2bfcf59..1b9bcf2264f 100644
--- a/ace/Caching_Strategies_T.i
+++ b/ace/Caching_Strategies_T.i
@@ -1,30 +1,28 @@
 /* -*-C++-*- */
 //$Id$
 
-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)
+template<class CONTAINER> ACE_INLINE ACE_LRU_Caching_Strategy<CONTAINER>::ATTRIBUTES
+ACE_LRU_Caching_Strategy<CONTAINER>::attributes (void)
 {
   return this->timer_;
 }   
 
-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)
+template<class CONTAINER> ACE_INLINE int
+ACE_LRU_Caching_Strategy<CONTAINER>::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 (unsigned int percentage)
+template<class CONTAINER> ACE_INLINE void
+ACE_LRU_Caching_Strategy<CONTAINER>::purge_percent (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, 
-                                                                                                    const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<CONTAINER>::notify_bind (int result, 
+                                                  const ATTRIBUTES &attributes)
 {
-  ACE_UNUSED_ARG (attr);
-  
   if (result == 0)
     {
       ++this->timer_;
@@ -34,9 +32,9 @@ 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_find (int result, 
-                                                                                                    ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<CONTAINER>::notify_find (int result, 
+                                                  ATTRIBUTES &attr)
 {
   if (result == 0)
     {
@@ -47,37 +45,32 @@ 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, 
-                                                                                                      const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<CONTAINER>::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, 
-                                                                                                       ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<CONTAINER>::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, 
-                                                                                                      const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_LRU_Caching_Strategy<CONTAINER>::notify_rebind (int result, 
+                                                          const ATTRIBUTES &attr)
 { 
-  ACE_UNUSED_ARG (attr);
-  
   if (result == 0)
     ++this->timer_;
 
   return result;
 }
 
-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 
+template<class CONTAINER> ACE_INLINE void
+ACE_LRU_Caching_Strategy<CONTAINER>::dump (void) const 
 {
   ACE_TRACE ("ACE_LRU_Caching_Strategy::dump");
       
@@ -88,79 +81,69 @@ 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 ATTRIBUTES
-ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
+template<class CONTAINER> ACE_INLINE ACE_LFU_Caching_Strategy<CONTAINER>::ATTRIBUTES
+ACE_LFU_Caching_Strategy<CONTAINER>::attributes (void)
 {
   return 0;
 }
 
-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)
+template<class CONTAINER> ACE_INLINE int
+ACE_LFU_Caching_Strategy<CONTAINER>::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 (unsigned int percentage)
+template<class CONTAINER> ACE_INLINE void
+ACE_LFU_Caching_Strategy<CONTAINER>::purge_percent (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, 
-                                                                                                    const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_LFU_Caching_Strategy<CONTAINER>::notify_bind (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_find (int result, 
-                                                                                                    ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int
+ACE_LFU_Caching_Strategy<CONTAINER>::notify_find (int result, 
+                                                  ATTRIBUTES &attr)
 {
-  ACE_UNUSED_ARG (attr);
-  
   if (result == 0)
     ++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_trybind (int result, 
-                                                                                                       ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_LFU_Caching_Strategy<CONTAINER>::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, 
-                                                                                                      const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_LFU_Caching_Strategy<CONTAINER>::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, 
-                                                                                                      const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_LFU_Caching_Strategy<CONTAINER>::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 void
-ACE_LFU_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
+template<class CONTAINER> ACE_INLINE void
+ACE_LFU_Caching_Strategy<CONTAINER>::dump (void) const
 {
   ACE_TRACE ("ACE_LFU_Caching_Strategy::dump");
       
@@ -170,29 +153,27 @@ 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 ATTRIBUTES
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
+template<class CONTAINER> ACE_INLINE ACE_FIFO_Caching_Strategy<CONTAINER>::ATTRIBUTES
+ACE_FIFO_Caching_Strategy<CONTAINER>::attributes (void)
 {
   return this->order_;
 }
-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)
+template<class CONTAINER> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<CONTAINER>::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 (unsigned int percentage)
+template<class CONTAINER> ACE_INLINE void
+ACE_FIFO_Caching_Strategy<CONTAINER>::purge_percent (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, 
-                                                                                                     const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<CONTAINER>::notify_bind (int result, 
+                                                   const ATTRIBUTES &attr)
 {
-  ACE_UNUSED_ARG (attr);
-  
   if (result == 0)
     {
       ++this->order_;
@@ -203,39 +184,31 @@ 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, 
-                                                                                                     ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_FIFO_Caching_Strategy<CONTAINER>::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, 
-                                                                                                       const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_FIFO_Caching_Strategy<CONTAINER>::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, 
-                                                                                                        ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_FIFO_Caching_Strategy<CONTAINER>::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)  
+template<class CONTAINER> ACE_INLINE int
+ACE_FIFO_Caching_Strategy<CONTAINER>::notify_rebind (int result, 
+                                                     const ATTRIBUTES &attr)  
 {
-  ACE_UNUSED_ARG (attr);
-  
   if (result == 0)
     {
       ++this->order_;
@@ -246,8 +219,8 @@ 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 void
-ACE_FIFO_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::dump (void) const
+template<class CONTAINER> ACE_INLINE void
+ACE_FIFO_Caching_Strategy<CONTAINER>::dump (void) const
 {
   ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump");
       
@@ -258,71 +231,60 @@ 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 ATTRIBUTES
-ACE_Null_Caching_Strategy<KEY, VALUE, CONTAINER, ATTRIBUTES, CACHING_STRATEGY_UTILITY>::attributes (void)
+template<class CONTAINER> ACE_INLINE ACE_Null_Caching_Strategy<CONTAINER>::ATTRIBUTES
+ACE_Null_Caching_Strategy<CONTAINER>::attributes (void)
 {
   return 0;
 }
 
-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)
+template<class CONTAINER> ACE_INLINE int
+ACE_Null_Caching_Strategy<CONTAINER>::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 (unsigned int percentage)
+template<class CONTAINER> ACE_INLINE void
+ACE_Null_Caching_Strategy<CONTAINER>::purge_percent (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, 
-                                                                                                     const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int
+ACE_Null_Caching_Strategy<CONTAINER>::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, 
-                                                                                                     ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_Null_Caching_Strategy<CONTAINER>::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, 
-                                                                                                       const ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_Null_Caching_Strategy<CONTAINER>::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, 
-                                                                                                        ATTRIBUTES &attr)
+template<class CONTAINER> ACE_INLINE int 
+ACE_Null_Caching_Strategy<CONTAINER>::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)  
+template<class CONTAINER> ACE_INLINE int
+ACE_Null_Caching_Strategy<CONTAINER>::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
+template<class CONTAINER> ACE_INLINE void
+ACE_Null_Caching_Strategy<CONTAINER>::dump (void) const
 {
   ACE_TRACE ("ACE_Null_Caching_Strategy::dump");
       
diff --git a/ace/Caching_Strategy_Utility_T.cpp b/ace/Caching_Strategy_Utility_T.cpp
index 7acbcad8c0a..98a7b842a5e 100644
--- a/ace/Caching_Strategy_Utility_T.cpp
+++ b/ace/Caching_Strategy_Utility_T.cpp
@@ -17,18 +17,11 @@
 
 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)
+template <class CONTAINER, class ATTRIBUTES> int 
+ACE_Caching_Strategy_Utility<CONTAINER, ATTRIBUTES>::clear_cache (CONTAINER &container, 
+                                                                  ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                                                                  const unsigned int purge_percent,
+                                                                  unsigned int &entries)
 {
   // Check that the purge_percent is non-zero.
   if (purge_percent == 0)
@@ -38,45 +31,45 @@ ACE_Svc_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::clear_cache
   // 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);
-
+  int no_of_entries = (int) ceil (val * entries);
+ 
   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;
-
-    }
-
+     {
+       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)
+template <class CONTAINER, class ATTRIBUTES> void 
+ACE_Caching_Strategy_Utility<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;
+  ITEM *item = 0;  
 
   // The iterator moves thru the container searching for the entry with the
-  // lowest ATTRIBUTES.
+  // lowest ATTRIBUTES.  
   for (min = (*iter).int_id_.second (), key = &(*iter).ext_id_, value = &(*iter).int_id_;
        iter.next (item) != 0;
        ++iter)
@@ -92,99 +85,4 @@ ACE_Svc_Caching_Strategy_Utility<KEY, VALUE, CONTAINER, ATTRIBUTES>::minimum (CO
     }
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-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
index 4375fcf3048..df9673498c1 100644
--- a/ace/Caching_Strategy_Utility_T.h
+++ b/ace/Caching_Strategy_Utility_T.h
@@ -18,48 +18,18 @@
 #define CACHING_STRATEGY_UTILITY_H
 
 #include "ace/OS.h"
+#include <math.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>
+template <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>
+template <class CONTAINER, class ATTRIBUTES>
+class ACE_Caching_Strategy_Utility
 {
   // = TITLE
   //    Defines a helper class for the Caching Strategies.
@@ -68,102 +38,27 @@ class ACE_Svc_Caching_Strategy_Utility : public ACE_Caching_Strategy_Utility<KEY
   //    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.
+  // = Traits.
+  typedef ACE_TYPENAME CONTAINER::KEY KEY;
+  typedef ACE_TYPENAME CONTAINER::VALUE VALUE;
+
+  int clear_cache (CONTAINER &container, 
+                   ACE_Cleanup_Strategy<CONTAINER> *cleanup_s,
+                   const unsigned int purge_percent,
+                   unsigned int &entries);
+  // Purge entries from the <container>. The <entries> had to be
+  // passed by refernce as it wuold reduce on cleanup.
   
-  virtual void minimum (CONTAINER &container, 
-                        KEY *&key,
-                        VALUE *&value);
+  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__ */
diff --git a/ace/Cleanup_Strategies_T.cpp b/ace/Cleanup_Strategies_T.cpp
index b54db63adf3..4afa343e84a 100644
--- a/ace/Cleanup_Strategies_T.cpp
+++ b/ace/Cleanup_Strategies_T.cpp
@@ -12,34 +12,32 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "ace/Cleanup_Strategies_T.i"
+#include "ace/Cached_Connect_Strategy_T.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
 ACE_RCSID(ace, Cleanup_Strategies_T, "$Id$")
 
-template <class KEY, class VALUE, class CONTAINER>
-ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>::~ACE_Cleanup_Strategy (void)
+template <class CONTAINER>
+ACE_Cleanup_Strategy<CONTAINER>::~ACE_Cleanup_Strategy (void)
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER> int
-ACE_Default_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
-                                                              KEY *key, 
-                                                              VALUE *value)
+template <class CONTAINER> int
+ACE_Default_Cleanup_Strategy<CONTAINER>::cleanup (CONTAINER &container, 
+                                                  KEY *key, 
+                                                  VALUE *value)
 {
-  ACE_UNUSED_ARG (value);
-
   return container.unbind (*key);
 }
 
 ////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER> int
-ACE_Svc_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
-                                                          KEY *key, 
-                                                          VALUE *value)
+template <class CONTAINER> int
+ACE_Svc_Cleanup_Strategy<CONTAINER>::cleanup (CONTAINER &container, 
+                                              KEY *key, 
+                                              VALUE *value)
 {
   (value->first ())->recycler (0, 0);
 
@@ -52,36 +50,12 @@ ACE_Svc_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container,
 }
 
 /////////////////////////////////////////////////////////////////////////////
-template <class KEY, class VALUE, class CONTAINER> int
-ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
-                                                              KEY *key, 
-                                                              VALUE *value)
-{
-  // Remove the item from cache only if the handler isnt in use.
-  if ((*value)->active () == 0)
-    {
-      (*value)->close ();
-
-      if (container.unbind (*key) == -1)
-        return -1;
-
-    }
-
-  return 0;
 
-}
-
-////////////////////////////////////////////////////////////////////////////
-template <class KEY, class VALUE, class CONTAINER> int
-ACE_Null_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (CONTAINER &container, 
-                                                           KEY *key, 
-                                                           VALUE *value)
+template <class CONTAINER> int
+ACE_Null_Cleanup_Strategy<CONTAINER>::cleanup (CONTAINER &container, 
+                                               KEY *key, 
+                                               VALUE *value)
 {
-
-  ACE_UNUSED_ARG (container);
-  ACE_UNUSED_ARG (key);
-  ACE_UNUSED_ARG (value);
-
   return 0;
 }
 
diff --git a/ace/Cleanup_Strategies_T.h b/ace/Cleanup_Strategies_T.h
index 05e51ce29de..4cdeec27b24 100644
--- a/ace/Cleanup_Strategies_T.h
+++ b/ace/Cleanup_Strategies_T.h
@@ -23,7 +23,7 @@
 #define  ACE_LACKS_PRAGMA_ONCE
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-template <class KEY, class VALUE, class CONTAINER>
+template <class CONTAINER>
 class ACE_Cleanup_Strategy
 {
   // = TITLE
@@ -35,7 +35,11 @@ class ACE_Cleanup_Strategy
   //    can be decoupled from other strategies which need to do it.
   //    The cleanup method provided needs to be implemented as needed.
   
- public:  
+ public:
+  
+  // Traits.
+  typedef ACE_TYPENAME CONTAINER::KEY KEY;
+  typedef ACE_TYPENAME CONTAINER::VALUE VALUE;
 
   // = Termination.
 
@@ -51,8 +55,8 @@ class ACE_Cleanup_Strategy
 
 //////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class CONTAINER>
-class ACE_Default_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
+template <class CONTAINER>
+class ACE_Default_Cleanup_Strategy : public ACE_Cleanup_Strategy<CONTAINER>
 {
   // = TITLE
   //     Defines a default strategy to be followed for cleaning up
@@ -63,15 +67,15 @@ class ACE_Default_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CON
   //     container.
 
 public:
- 
+
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The method which will do the cleanup of the entry in the container.
 
 };
 
 //////////////////////////////////////////////////////////////////////
-template <class KEY, class VALUE, class CONTAINER>
-class ACE_Svc_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
+template <class CONTAINER>
+class ACE_Svc_Cleanup_Strategy : public ACE_Cleanup_Strategy<CONTAINER>
 {
   // = TITLE
   //     Defines a strategy to be followed for cleaning up
@@ -80,33 +84,10 @@ class ACE_Svc_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAIN
   // = DESCRIPTION
   //     The entry to be cleaned up is removed from the container.
   //     Here, since we are dealing with svc_handlers specifically, we
-  //     perform a couple of extra operations. Note: To be used when
-  //     the handler is recyclable.
+  //     perform a couple of extra operations.
 
 public:
- 
-  virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
-  // The method which will do the cleanup of the entry in the container.
-
-};
 
-//////////////////////////////////////////////////////////////////////
-template <class KEY, class VALUE, class CONTAINER>
-class ACE_Handler_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
-{
-  // = TITLE
-  //     Defines a strategy to be followed for cleaning up
-  //     entries which are svc_handlers from a container. 
-  //
-  // = DESCRIPTION
-  //     The entry to be cleaned up is removed from the container.
-  //     Here, since we are dealing with svc_handlers specifically, we
-  //     perform a couple of extra operations. Note: This cleanup strategy
-  //     should be used in the case when the handler has the caching
-  //     attributes.
-
-public:
-  
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
   // The method which will do the cleanup of the entry in the container.
 
@@ -114,9 +95,8 @@ public:
 
 //////////////////////////////////////////////////////////////////////
 
-
-template <class KEY, class VALUE, class CONTAINER>
-class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAINER>
+template <class CONTAINER>
+class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy<CONTAINER>
 {
   // = TITLE
   //     Defines a do-nothing implementation of the cleanup strategy.
@@ -126,9 +106,9 @@ class ACE_Null_Cleanup_Strategy : public ACE_Cleanup_Strategy<KEY, VALUE, CONTAI
   //     the effect of the Cleanup Strategy.
 
 public:
- 
+
   virtual int cleanup (CONTAINER &container, KEY *key, VALUE *value);
-  // The dummy cleanup method.
+  // the dummy cleanup method.
 
 };
 
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index 9761a204c1e..a0e12e99768 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -457,11 +457,14 @@ ACE_Connector<SH, PR_CO_2>::connect_i (SH *&sh,
         }
       else
         {
-          // Save/restore errno.
-          ACE_Errno_Guard error (errno);
+          // Make sure to save/restore the errno since <close> may
+          // change it.
+
+          int error = errno;
           // Make sure to close down the Channel to avoid descriptor
           // leaks.
           new_sh->close (0);
+          errno = error;
         }
       return -1;
     }
@@ -532,8 +535,7 @@ template <class SH, PR_CO_1> int
 ACE_Connector<SH, PR_CO_2>::create_AST (SH *sh,
                                         const ACE_Synch_Options &synch_options)
 {
-  // Save/restore errno.
-  ACE_Errno_Guard error (errno);
+  int error = errno;
   ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::create_AST");
   AST *ast;
 
@@ -567,10 +569,18 @@ ACE_Connector<SH, PR_CO_2>::create_AST (SH *sh,
             goto fail3;
 
           ast->cancellation_id (cancellation_id);
+          // Reset this because something might have gone wrong
+          // elsewhere...
+          errno = error;
           return 0;
         }
       else
-        return 0; // Ok, everything worked just fine...
+        {
+          // Reset this because something might have gone wrong
+          // elsewhere...
+          errno = error; // EWOULDBLOCK
+          return 0; // Ok, everything worked just fine...
+        }
     }
 
   // Undo previous actions using the ol' "goto label and fallthru"
diff --git a/ace/Connector.h b/ace/Connector.h
index d01dc24d1e2..4f1f93a00b8 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -148,9 +148,7 @@ public:
   // <local_addr> be reused by passing a value <reuse_addr> ==
   // 1). <flags> and <perms> can be used to pass any flags that are
   // needed to perform specific operations such as opening a file
-  // within connect with certain permissions.  If the connection fails
-  // the <close> hook on the <svc_handler> will be called
-  // automatically to prevent resource leaks.
+  // within connect with certain permissions.
 
   virtual int connect (SVC_HANDLER *&svc_handler_hint,
                        SVC_HANDLER *&svc_handler,
@@ -161,21 +159,18 @@ public:
                        int reuse_addr = 0,
                        int flags = O_RDWR,
                        int perms = 0);
-  // This is a variation on the previous <connect> method.  On cached
-  // connectors the <svc_handler_hint> variable can be used as a hint
-  // for future lookups.  Since this variable is modified in the
-  // context of the internal cache its use is thread-safe.  But the
-  // actual svc_handler for the current connection is returned in the
-  // second parameter <svc_handler>.  If the connection fails the
-  // <close> hook on the <svc_handler> will be called automatically to
-  // prevent resource leaks.
+  // A variation on the previous connect(), on cached connectors the
+  // <svc_handler_hint> variable can be used as a hint for future
+  // lookups. Since this variable is modified in the context of the
+  // internal cache its use is thread-safe.  But the actual
+  // svc_handler for the current connection is returned in the second
+  // parameter <svc_handler>.
 
   virtual int connect_n (size_t n,
                          SVC_HANDLER *svc_handlers[],
                          ACE_PEER_CONNECTOR_ADDR remote_addrs[],
                          ASYS_TCHAR *failed_svc_handlers = 0,
-                         const ACE_Synch_Options &synch_options =
-                         ACE_Synch_Options::defaults);
+                         const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults);
   // Initiate connection of <n> <svc_handlers> to peers at
   // <remote_addrs> using <synch_options>.  Returns -1 if failure
   // occurs and 0 otherwise.  If <failed_svc_handlers> is non-NULL, a
diff --git a/ace/Containers.cpp b/ace/Containers.cpp
index 36730dd1b70..cdbaa32f4f9 100644
--- a/ace/Containers.cpp
+++ b/ace/Containers.cpp
@@ -12,13 +12,9 @@ ACE_RCSID(ace, Containers, "$Id$")
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Double_Linked_List<ACE_DLList_Node>;
-template class ACE_Double_Linked_List_Iterator_Base<ACE_DLList_Node>;
 template class ACE_Double_Linked_List_Iterator<ACE_DLList_Node>;
-template class ACE_Double_Linked_List_Reverse_Iterator<ACE_DLList_Node>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Double_Linked_List<ACE_DLList_Node>
-#pragma instantiate ACE_Double_Linked_List_Iterator_Base<ACE_DLList_Node>
 #pragma instantiate ACE_Double_Linked_List_Iterator<ACE_DLList_Node>
-#pragma instantiate ACE_Double_Linked_List_Reverse_Iterator<ACE_DLList_Node>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/ace/Containers.h b/ace/Containers.h
index 7ac2230b761..eb9b107b74f 100644
--- a/ace/Containers.h
+++ b/ace/Containers.h
@@ -28,11 +28,7 @@ template <class T>
 class ACE_Double_Linked_List;
 
 template <class T>
-class ACE_Double_Linked_List_Iterator_Base;
-template <class T>
 class ACE_Double_Linked_List_Iterator;
-template <class T>
-class ACE_Double_Linked_List_Reverse_Iterator;
 
 class ACE_Export ACE_DLList_Node
 {
@@ -41,9 +37,7 @@ class ACE_Export ACE_DLList_Node
   //     ACE_Double_Linked_List.
 public:
   friend class ACE_Double_Linked_List<ACE_DLList_Node>;
-  friend class ACE_Double_Linked_List_Iterator_Base<ACE_DLList_Node>;
   friend class ACE_Double_Linked_List_Iterator<ACE_DLList_Node>;
-  friend class ACE_Double_Linked_List_Reverse_Iterator<ACE_DLList_Node>;
 
   ACE_DLList_Node (void *&i,
                    ACE_DLList_Node *n = 0,
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 773b7750467..15d6dda2c4b 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -17,10 +17,10 @@
 #include "ace/Containers_T.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ace, Containers_T, "$Id$") 
+ACE_RCSID(ace, Containers_T, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Stack)
-  
+
 template <class T> void
 ACE_Bounded_Stack<T>::dump (void) const
 {
@@ -33,6 +33,7 @@ ACE_Bounded_Stack<T>::ACE_Bounded_Stack (size_t size)
     size_ (size)
 {
   ACE_NEW (this->stack_, T[size]);
+
   ACE_TRACE ("ACE_Bounded_Stack<T>::ACE_Bounded_Stack");
 }
 
@@ -275,7 +276,7 @@ ACE_Unbounded_Stack<T>::pop (T &item)
 template <class T> int
 ACE_Unbounded_Stack<T>::find (const T &item) const
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack<T>::find");
+// ACE_TRACE ("ACE_Unbounded_Stack<T>::find");
   // Set <item> into the dummy node.
   this->head_->item_ = item;
 
@@ -293,7 +294,7 @@ ACE_Unbounded_Stack<T>::find (const T &item) const
 template <class T> int
 ACE_Unbounded_Stack<T>::insert (const T &item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack<T>::insert");
+// ACE_TRACE ("ACE_Unbounded_Stack<T>::insert");
 
   if (this->find (item) == 0)
     return 1;
@@ -304,7 +305,7 @@ ACE_Unbounded_Stack<T>::insert (const T &item)
 template <class T> int
 ACE_Unbounded_Stack<T>::remove (const T &item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack<T>::remove");
+// ACE_TRACE ("ACE_Unbounded_Stack<T>::remove");
 
   // Insert the item to be founded into the dummy node.
   this->head_->item_ = item;
@@ -336,7 +337,7 @@ ACE_Unbounded_Queue<T>::ACE_Unbounded_Queue (ACE_Allocator *alloc)
     cur_size_ (0),
     allocator_ (alloc)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::ACE_Unbounded_Queue (void)");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::ACE_Unbounded_Queue (void)");
 
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -355,7 +356,7 @@ ACE_Unbounded_Queue<T>::ACE_Unbounded_Queue (const ACE_Unbounded_Queue<T> &us)
     cur_size_ (0),
     allocator_ (us.allocator_)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::ACE_Unbounded_Queue");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::ACE_Unbounded_Queue");
 
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -370,7 +371,7 @@ ACE_Unbounded_Queue<T>::ACE_Unbounded_Queue (const ACE_Unbounded_Queue<T> &us)
 template <class T> void
 ACE_Unbounded_Queue<T>::operator= (const ACE_Unbounded_Queue<T> &us)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::operator=");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::operator=");
 
   if (this != &us)
     {
@@ -399,7 +400,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Queue)
 template <class T> void
 ACE_Unbounded_Queue<T>::dump (void) const
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::dump");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nhead_ = %u"), this->head_));
@@ -456,7 +457,7 @@ ACE_Unbounded_Queue<T>::delete_nodes (void)
 template <class T>
 ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)");
 
   this->delete_nodes ();
   ACE_DES_FREE_TEMPLATE (head_,
@@ -469,7 +470,7 @@ ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)
 template <class T> int
 ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_tail");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_tail");
 
   ACE_Node<T> *temp;
 
@@ -489,7 +490,7 @@ ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item)
 template <class T> int
 ACE_Unbounded_Queue<T>::enqueue_tail (const T &new_item)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_head");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_head");
 
   ACE_Node<T> *temp;
 
@@ -514,7 +515,7 @@ ACE_Unbounded_Queue<T>::enqueue_tail (const T &new_item)
 template <class T> int
 ACE_Unbounded_Queue<T>::dequeue_head (T &item)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::dequeue_head");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::dequeue_head");
 
   // Check for empty queue.
   if (this->is_empty ())
@@ -543,7 +544,7 @@ ACE_Unbounded_Queue<T>::reset (void)
 template <class T> int
 ACE_Unbounded_Queue<T>::get (T *&item, size_t slot) const
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::get");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::get");
 
   ACE_Node<T> *curr = this->head_->next_;
 
@@ -570,7 +571,7 @@ template <class T> int
 ACE_Unbounded_Queue<T>::set (const T &item,
                              size_t slot)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::set");
+//   ACE_TRACE ("ACE_Unbounded_Queue<T>::set");
 
   ACE_Node<T> *curr = this->head_->next_;
 
@@ -628,21 +629,21 @@ ACE_Unbounded_Queue<T>::set (const T &item,
 template <class T> void
 ACE_Unbounded_Queue_Iterator<T>::dump (void) const
 {
-  // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::dump");
+// ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::dump");
 }
 
 template <class T>
 ACE_Unbounded_Queue_Iterator<T>::ACE_Unbounded_Queue_Iterator (ACE_Unbounded_Queue<T> &q, int end)
-  : current_ (end == 0 ? q.head_->next_ : q.head_ ),
-    queue_ (q)
+    : current_ (end == 0 ? q.head_->next_ : q.head_ ),
+      queue_ (q)
 {
-  // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::ACE_Unbounded_Queue_Iterator");
+// ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::ACE_Unbounded_Queue_Iterator");
 }
 
 template <class T> int
 ACE_Unbounded_Queue_Iterator<T>::advance (void)
 {
-  // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::advance");
+// ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::advance");
   this->current_ = this->current_->next_;
   return this->current_ != this->queue_.head_;
 }
@@ -650,7 +651,7 @@ ACE_Unbounded_Queue_Iterator<T>::advance (void)
 template <class T> int
 ACE_Unbounded_Queue_Iterator<T>::first (void)
 {
-  // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::first");
+// ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::first");
   this->current_ = this->queue_.head_->next_;
   return this->current_ != this->queue_.head_;
 }
@@ -666,7 +667,7 @@ ACE_Unbounded_Queue_Iterator<T>::done (void) const
 template <class T> int
 ACE_Unbounded_Queue_Iterator<T>::next (T *&item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::next");
+// ACE_TRACE ("ACE_Unbounded_Queue_Iterator<T>::next");
   if (this->current_ == this->queue_.head_)
     return 0;
   else
@@ -677,84 +678,26 @@ ACE_Unbounded_Queue_Iterator<T>::next (T *&item)
 }
 
 //--------------------------------------------------
-ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator_Base)
-  
-template <class T>
-ACE_Double_Linked_List_Iterator_Base<T>::ACE_Double_Linked_List_Iterator_Base (ACE_Double_Linked_List<T> &dll)
-  : current_ (0), dllist_ (&dll)
-{
-  // Do nothing
-}
+ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator)
 
 template <class T>
-ACE_Double_Linked_List_Iterator_Base<T>::ACE_Double_Linked_List_Iterator_Base (const ACE_Double_Linked_List_Iterator_Base<T> &iter)
-  : current_ (iter.current_),
-    dllist_ (iter.dllist_)
-{
-  // Do nothing
-}
-
-
-template <class T> T *
-ACE_Double_Linked_List_Iterator_Base<T>::next (void) const
-{
-  return this->not_done ();
-}
-
-template <class T> int
-ACE_Double_Linked_List_Iterator_Base<T>::next (T *&ptr) const
-{
-  ptr = this->not_done ();
-  return ptr ? 1 : 0;
-}
-
-
-template <class T> int
-ACE_Double_Linked_List_Iterator_Base<T>::done (void) const
-{
-  return this->not_done () ? 0 : 1;
-}
-
-template <class T> T & 
-ACE_Double_Linked_List_Iterator_Base<T>::operator* (void) const
-{
-  return *(this->not_done ());
-}
-
-// @@ Is this a valid retasking? Make sure to check with Purify and
-// whatnot that we're not leaking memory or doing any other screwing things.
-template <class T> void
-ACE_Double_Linked_List_Iterator_Base<T>::reset (ACE_Double_Linked_List<T> &dll)
-{
-  current_ = 0;
-  dllist_ = &dll;
-}
-
- template <class T> int
-ACE_Double_Linked_List_Iterator_Base<T>::go_head (void)
-{
-  this->current_ = ACE_static_cast (T*, dllist_->head_->next_);
-  return this->current_ ? 1 : 0;
-}
-
-template <class T> int
-ACE_Double_Linked_List_Iterator_Base<T>::go_tail (void)
+ACE_Double_Linked_List_Iterator<T>::ACE_Double_Linked_List_Iterator (ACE_Double_Linked_List<T> &dll)
+  : dllist_ (dll)
 {
-  this->current_ = ACE_static_cast (T*, dllist_->head_->prev_);
-  return this->current_ ? 1 : 0;
+  this->current_ = ACE_static_cast (T*, dll.head_->next_);  // Initialize head ptr.
 }
 
 template <class T> T *
-ACE_Double_Linked_List_Iterator_Base<T>::not_done (void) const
+ACE_Double_Linked_List_Iterator<T>::not_done (void) const
 {
-  if (this->current_ != this->dllist_->head_)
+  if (this->current_ != this->dllist_.head_)
     return this->current_;
   else
     return 0;
 }
 
 template <class T> T *
-ACE_Double_Linked_List_Iterator_Base<T>::do_advance (void)
+ACE_Double_Linked_List_Iterator<T>::do_advance (void)
 {
   if (this->not_done ())
     {
@@ -766,41 +709,9 @@ ACE_Double_Linked_List_Iterator_Base<T>::do_advance (void)
 }
 
 template <class T> T *
-ACE_Double_Linked_List_Iterator_Base<T>::do_retreat (void)
-{
-  if (this->not_done ())
-    {
-      this->current_ = ACE_static_cast (T*, this->current_->prev_);
-      return this->not_done ();
-    }
-  else
-    return 0;
-}
-
-template <class T> void
-ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const
+ACE_Double_Linked_List_Iterator<T>::next (void) const
 {
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("current_ = %x"), this->current_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-//--------------------------------------------------
-ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Iterator)
-  
-template <class T>
-ACE_Double_Linked_List_Iterator<T>::ACE_Double_Linked_List_Iterator (ACE_Double_Linked_List<T> &dll)
-  : ACE_Double_Linked_List_Iterator_Base <T> (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)
-{
-  return this->go_head ();
+  return this->not_done ();
 }
 
 template <class T> int
@@ -809,167 +720,28 @@ ACE_Double_Linked_List_Iterator<T>::advance (void)
   return this->do_advance () ? 1 : 0;
 }
 
-template <class T> T*
-ACE_Double_Linked_List_Iterator<T>::advance_and_remove (int dont_remove)
-{
-  T* item = 0;
-  if (dont_remove)
-    this->do_advance ();
-  else
-    {
-      item = this->next ();
-      this->do_advance ();
-      dllist_->remove (item);
-    }
-  return item;
-}
-
-template <class T> void
-ACE_Double_Linked_List_Iterator<T>::dump (void) const
-{
-  this->dump_i ();
-}
-
-// Prefix advance.
-
-template <class T>
-ACE_Double_Linked_List_Iterator<T> &
-ACE_Double_Linked_List_Iterator<T>::operator++ (void)
-{
-  this->do_advance ();
-  return *this;
-}
-
-
-// Postfix advance.
-
-template <class T>
-ACE_Double_Linked_List_Iterator<T>
-ACE_Double_Linked_List_Iterator<T>::operator++ (int)
-{
-  ACE_Double_Linked_List_Iterator<T> retv (*this);
-  this->do_advance ();
-  return retv;
-}
-
-
-// Prefix reverse.
-
-template <class T>
-ACE_Double_Linked_List_Iterator<T> &
-ACE_Double_Linked_List_Iterator<T>::operator-- (void)
-{
-  this->do_retreat ();
-  return *this;
-}
-
-
-// Postfix reverse.
-
-template <class T>
-ACE_Double_Linked_List_Iterator<T>
-ACE_Double_Linked_List_Iterator<T>::operator-- (int)
-{
-  ACE_Double_Linked_List_Iterator<T> retv (*this);
-  this->do_retreat ();
-  return retv;
-}
-
-
-//--------------------------------------------------
-ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List_Reverse_Iterator)
-
-  template <class T>
-ACE_Double_Linked_List_Reverse_Iterator<T>::ACE_Double_Linked_List_Reverse_Iterator (ACE_Double_Linked_List<T> &dll)
-  : ACE_Double_Linked_List_Iterator_Base <T> (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)
+ACE_Double_Linked_List_Iterator<T>::first (void)
 {
-  return this->go_tail ();
+  this->current_ = ACE_static_cast (T*, dllist_.head_->next_);
+  return this->not_done () ? 1 : 0;
 }
 
 template <class T> int
-ACE_Double_Linked_List_Reverse_Iterator<T>::advance (void)
-{
-  return this->do_retreat () ? 1 : 0;
-}
-
-template <class T> T*
-ACE_Double_Linked_List_Reverse_Iterator<T>::advance_and_remove (int dont_remove)
+ACE_Double_Linked_List_Iterator<T>::done (void) const
 {
-  T* item = 0;
-  if (dont_remove)
-    this->do_retreat ();
-  else
-    {
-      item = this->next ();
-      this->do_retreat ();
-      dllist_->remove (item);
-    }
-  return item;
+  return this->not_done () ? 0 : 1;
 }
 
 template <class T> void
-ACE_Double_Linked_List_Reverse_Iterator<T>::dump (void) const
-{
-  this->dump_i ();
-}
-
-// Prefix advance.
-
-template <class T>
-ACE_Double_Linked_List_Reverse_Iterator<T> &
-ACE_Double_Linked_List_Reverse_Iterator<T>::operator++ (void)
-{
-  this->do_retreat ();
-  return *this;
-}
-
-
-// Postfix advance.
-
-template <class T>
-ACE_Double_Linked_List_Reverse_Iterator<T>
-ACE_Double_Linked_List_Reverse_Iterator<T>::operator++ (int)
-{
-  ACE_Double_Linked_List_Reverse_Iterator<T> retv (*this);
-  this->do_retreat ();
-  return retv;
-}
-
-
-// Prefix reverse.
-
-template <class T>
-ACE_Double_Linked_List_Reverse_Iterator<T> &
-ACE_Double_Linked_List_Reverse_Iterator<T>::operator-- (void)
+ACE_Double_Linked_List_Iterator<T>::dump (void) const
 {
-  this->do_advance ();
-  return *this;
+  // Dump the state of an object.
 }
 
-
-// Postfix reverse.
+ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List)
 
 template <class T>
-ACE_Double_Linked_List_Reverse_Iterator<T>
-ACE_Double_Linked_List_Reverse_Iterator<T>::operator-- (int)
-{
-  ACE_Double_Linked_List_Reverse_Iterator<T> retv (*this);
-  this->do_advance ();
-  return retv;
-}
-
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Double_Linked_List)
-  
-  template <class T>
 ACE_Double_Linked_List<T>:: ACE_Double_Linked_List (ACE_Allocator *alloc)
   : size_ (0), allocator_ (alloc)
 {
@@ -1131,7 +903,7 @@ ACE_Double_Linked_List<T>::remove (const T &item)
   T *temp = this->find (item);
 
   if (temp != 0)
-    return this->remove (temp);
+      return this->remove (temp);
   else
     return -1;
 }
@@ -1210,7 +982,7 @@ ACE_Double_Linked_List<T>::remove_element (T *item)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Fixed_Set)
 
-  template <class T, size_t ACE_SIZE> size_t
+template <class T, size_t ACE_SIZE> size_t
 ACE_Fixed_Set<T, ACE_SIZE>::size (void) const
 {
   return this->cur_size_;
@@ -1307,7 +1079,7 @@ ACE_Fixed_Set<T, ACE_SIZE>::insert (const T &item)
       this->search_structure_[first_free].is_free_ = 0;
       return 0;
     }
-  // Insert at the end of the active portion.
+    // Insert at the end of the active portion.
   else if (i < this->max_size_)
     {
       this->search_structure_[i].item_ = item;
@@ -1355,7 +1127,7 @@ ACE_Fixed_Set<T, ACE_SIZE>::remove (const T &item)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Fixed_Set_Iterator)
 
-  template <class T, size_t ACE_SIZE> void
+template <class T, size_t ACE_SIZE> void
 ACE_Fixed_Set_Iterator<T, ACE_SIZE>::dump (void) const
 {
   ACE_TRACE ("ACE_Fixed_Set_Iterator<T, ACE_SIZE>::dump");
@@ -1377,7 +1149,7 @@ ACE_Fixed_Set_Iterator<T, ACE_SIZE>::advance (void)
 
   for (++this->next_;
        ACE_static_cast(size_t, this->next_) < this->s_.cur_size_
-         && this->s_.search_structure_[this->next_].is_free_;
+       && this->s_.search_structure_[this->next_].is_free_;
        ++this->next_)
     continue;
 
@@ -1417,7 +1189,7 @@ ACE_Fixed_Set_Iterator<T, ACE_SIZE>::next (T *&item)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Set)
 
-  template <class T> void
+template <class T> void
 ACE_Bounded_Set<T>::dump (void) const
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::dump");
@@ -1438,7 +1210,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (void)
   ACE_TRACE ("ACE_Bounded_Set<T>::ACE_Bounded_Set");
 
   ACE_NEW (this->search_structure_,
-           ACE_TYPENAME ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
+           ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
 
   for (size_t i = 0; i < this->max_size_; i++)
     this->search_structure_[i].is_free_ = 1;
@@ -1452,7 +1224,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (const ACE_Bounded_Set<T> &bs)
   ACE_TRACE ("ACE_Bounded_Set<T>::ACE_Bounded_Set");
 
   ACE_NEW (this->search_structure_,
-           ACE_TYPENAME ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
+           ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
 
   for (size_t i = 0; i < this->cur_size_; i++)
     this->search_structure_[i] = bs.search_structure_[i];
@@ -1468,7 +1240,7 @@ 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_NEW (this->search_structure_,
                    ACE_Bounded_Set<T>::Search_Structure[bs.cur_size_]);
           this->max_size_ = bs.cur_size_;
         }
@@ -1487,7 +1259,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (size_t size)
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::ACE_Bounded_Set");
   ACE_NEW (this->search_structure_,
-           ACE_TYPENAME ACE_Bounded_Set<T>::Search_Structure[size]);
+           ACE_Bounded_Set<T>::Search_Structure[size]);
 
   for (size_t i = 0; i < this->max_size_; i++)
     this->search_structure_[i].is_free_ = 1;
@@ -1571,7 +1343,7 @@ ACE_Bounded_Set<T>::remove (const T &item)
 }
 
 #if defined (__Lynx__)
-// LynxOS 3.0.0 native g++ compiler raises internal error with this inline.
+ // LynxOS 3.0.0 native g++ compiler raises internal error with this inline.
 template <class T> int
 ACE_Bounded_Set<T>::is_full (void) const
 {
@@ -1582,7 +1354,7 @@ ACE_Bounded_Set<T>::is_full (void) const
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Bounded_Set_Iterator)
 
-  template <class T> void
+template <class T> void
 ACE_Bounded_Set_Iterator<T>::dump (void) const
 {
   ACE_TRACE ("ACE_Bounded_Set_Iterator<T>::dump");
@@ -1604,13 +1376,28 @@ ACE_Bounded_Set_Iterator<T>::advance (void)
 
   for (++this->next_;
        ACE_static_cast(size_t, this->next_) < this->s_.cur_size_
-         && this->s_.search_structure_[this->next_].is_free_;
+       && this->s_.search_structure_[this->next_].is_free_;
        ++this->next_)
     continue;
 
   return ACE_static_cast(size_t, this->next_) < this->s_.cur_size_;
 }
 
+template <class T> T*
+ACE_Double_Linked_List_Iterator<T>::advance_and_remove (int dont_remove)
+{
+  T* item = 0;
+  if (dont_remove)
+      this->do_advance ();
+  else
+    {
+      item = this->next ();
+      this->do_advance ();
+      this->dllist_.remove_element (item);
+    }
+  return item;
+}
+
 template <class T> int
 ACE_Bounded_Set_Iterator<T>::first (void)
 {
@@ -1645,7 +1432,7 @@ ACE_Bounded_Set_Iterator<T>::next (T *&item)
 ACE_ALLOC_HOOK_DEFINE(ACE_Node)
 
 # if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
-  template <class T>
+template <class T>
 ACE_Node<T>::~ACE_Node (void)
 {
 }
@@ -1656,14 +1443,14 @@ ACE_Node<T>::ACE_Node (const T &i, ACE_Node<T> *n)
   : next_ (n),
     item_ (i)
 {
-  // ACE_TRACE ("ACE_Node<T>::ACE_Node");
+// ACE_TRACE ("ACE_Node<T>::ACE_Node");
 }
 
 template <class T>
 ACE_Node<T>::ACE_Node (ACE_Node<T> *n, int)
   : next_ (n)
 {
-  // ACE_TRACE ("ACE_Node<T>::ACE_Node");
+// ACE_TRACE ("ACE_Node<T>::ACE_Node");
 }
 
 template <class T>
@@ -1671,12 +1458,12 @@ ACE_Node<T>::ACE_Node (const ACE_Node<T> &s)
   : next_ (s.next_),
     item_ (s.item_)
 {
-  // ACE_TRACE ("ACE_Node<T>::ACE_Node");
+// ACE_TRACE ("ACE_Node<T>::ACE_Node");
 }
 
 ACE_ALLOC_HOOK_DEFINE(ACE_DNode)
 
-  template <class T>
+template <class T>
 ACE_DNode<T>::ACE_DNode (const T &i, ACE_DNode<T> *n, ACE_DNode<T> *p)
   : next_ (n), prev_ (p), item_ (i)
 {
@@ -1691,17 +1478,17 @@ ACE_DNode<T>::~ACE_DNode (void)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set)
 
-  template <class T> size_t
+template <class T> size_t
 ACE_Unbounded_Set<T>::size (void) const
 {
-  // ACE_TRACE ("ACE_Unbounded_Set<T>::size");
+// ACE_TRACE ("ACE_Unbounded_Set<T>::size");
   return this->cur_size_;
 }
 
 template <class T> int
 ACE_Unbounded_Set<T>::insert_tail (const T &item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Queue<T>::insert_tail");
+// ACE_TRACE ("ACE_Unbounded_Queue<T>::insert_tail");
   ACE_Node<T> *temp;
 
   // Insert <item> into the old dummy node location.
@@ -1788,7 +1575,7 @@ ACE_Unbounded_Set<T>::delete_nodes (void)
 template <class T>
 ACE_Unbounded_Set<T>::~ACE_Unbounded_Set (void)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set<T>::~ACE_Unbounded_Set");
+// ACE_TRACE ("ACE_Unbounded_Set<T>::~ACE_Unbounded_Set");
 
   this->delete_nodes ();
 
@@ -1806,7 +1593,7 @@ ACE_Unbounded_Set<T>::ACE_Unbounded_Set (ACE_Allocator *alloc)
     cur_size_ (0),
     allocator_ (alloc)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set<T>::ACE_Unbounded_Set");
+// ACE_TRACE ("ACE_Unbounded_Set<T>::ACE_Unbounded_Set");
 
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -1852,7 +1639,7 @@ ACE_Unbounded_Set<T>::operator= (const ACE_Unbounded_Set<T> &us)
 template <class T> int
 ACE_Unbounded_Set<T>::find (const T &item) const
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack<T>::find");
+// ACE_TRACE ("ACE_Unbounded_Stack<T>::find");
   // Set <item> into the dummy node.
   this->head_->item_ = item;
 
@@ -1870,7 +1657,7 @@ ACE_Unbounded_Set<T>::find (const T &item) const
 template <class T> int
 ACE_Unbounded_Set<T>::insert (const T &item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set<T>::insert");
+// ACE_TRACE ("ACE_Unbounded_Set<T>::insert");
   if (this->find (item) == 0)
     return 1;
   else
@@ -1880,7 +1667,7 @@ ACE_Unbounded_Set<T>::insert (const T &item)
 template <class T> int
 ACE_Unbounded_Set<T>::remove (const T &item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set<T>::remove");
+// ACE_TRACE ("ACE_Unbounded_Set<T>::remove");
 
   // Insert the item to be founded into the dummy node.
   this->head_->item_ = item;
@@ -1923,24 +1710,24 @@ ACE_Unbounded_Set<T>::end (void)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set_Iterator)
 
-  template <class T> void
+template <class T> void
 ACE_Unbounded_Set_Iterator<T>::dump (void) const
 {
-  // ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::dump");
+// ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::dump");
 }
 
 template <class T>
 ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, int end)
-  : current_ (end == 0 ? s.head_->next_ : s.head_ ),
-    set_ (&s)
+    : current_ (end == 0 ? s.head_->next_ : s.head_ ),
+      set_ (&s)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator");
+// ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::ACE_Unbounded_Set_Iterator");
 }
 
 template <class T> int
 ACE_Unbounded_Set_Iterator<T>::advance (void)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::advance");
+// ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::advance");
   this->current_ = this->current_->next_;
   return this->current_ != this->set_->head_;
 }
@@ -1948,7 +1735,7 @@ ACE_Unbounded_Set_Iterator<T>::advance (void)
 template <class T> int
 ACE_Unbounded_Set_Iterator<T>::first (void)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::first");
+// ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::first");
   this->current_ = this->set_->head_->next_;
   return this->current_ != this->set_->head_;
 }
@@ -1964,7 +1751,7 @@ ACE_Unbounded_Set_Iterator<T>::done (void) const
 template <class T> int
 ACE_Unbounded_Set_Iterator<T>::next (T *&item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::next");
+// ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::next");
   if (this->current_ == this->set_->head_)
     return 0;
   else
@@ -2027,21 +1814,21 @@ ACE_Unbounded_Set_Iterator<T>::operator!= (const ACE_Unbounded_Set_Iterator<T> &
 template <class T> void
 ACE_Unbounded_Stack_Iterator<T>::dump (void) const
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::dump");
+// ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::dump");
 }
 
 template <class T>
 ACE_Unbounded_Stack_Iterator<T>::ACE_Unbounded_Stack_Iterator (ACE_Unbounded_Stack<T> &q)
-  : current_ (q.head_->next_),
-    stack_ (q)
+    : current_ (q.head_->next_),
+      stack_ (q)
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::ACE_Unbounded_Stack_Iterator");
+// ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::ACE_Unbounded_Stack_Iterator");
 }
 
 template <class T> int
 ACE_Unbounded_Stack_Iterator<T>::advance (void)
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::advance");
+// ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::advance");
   this->current_ = this->current_->next_;
   return this->current_ != this->stack_.head_;
 }
@@ -2049,7 +1836,7 @@ ACE_Unbounded_Stack_Iterator<T>::advance (void)
 template <class T> int
 ACE_Unbounded_Stack_Iterator<T>::first (void)
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::first");
+// ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::first");
   this->current_ = this->stack_.head_->next_;
   return this->current_ != this->stack_.head_;
 }
@@ -2065,7 +1852,7 @@ ACE_Unbounded_Stack_Iterator<T>::done (void) const
 template <class T> int
 ACE_Unbounded_Stack_Iterator<T>::next (T *&item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::next");
+// ACE_TRACE ("ACE_Unbounded_Stack_Iterator<T>::next");
   if (this->current_ == this->stack_.head_)
     return 0;
   else
@@ -2079,14 +1866,14 @@ ACE_Unbounded_Stack_Iterator<T>::next (T *&item)
 ACE_ALLOC_HOOK_DEFINE(ACE_Ordered_MultiSet)
 
 
-  template <class T>
+template <class T>
 ACE_Ordered_MultiSet<T>::ACE_Ordered_MultiSet (ACE_Allocator *alloc)
   : head_ (0)
   , tail_ (0)
   , cur_size_ (0)
   , allocator_ (alloc)
 {
-  // ACE_TRACE ("ACE_Ordered_MultiSet<T>::ACE_Ordered_MultiSet");
+// ACE_TRACE ("ACE_Ordered_MultiSet<T>::ACE_Ordered_MultiSet");
 
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -2110,7 +1897,7 @@ ACE_Ordered_MultiSet<T>::ACE_Ordered_MultiSet (const ACE_Ordered_MultiSet<T> &us
 template <class T>
 ACE_Ordered_MultiSet<T>::~ACE_Ordered_MultiSet (void)
 {
-  // ACE_TRACE ("ACE_Ordered_MultiSet<T>::~ACE_Ordered_MultiSet");
+// ACE_TRACE ("ACE_Ordered_MultiSet<T>::~ACE_Ordered_MultiSet");
 
   this->delete_nodes ();
 }
@@ -2132,7 +1919,7 @@ ACE_Ordered_MultiSet<T>::operator= (const ACE_Ordered_MultiSet<T> &us)
 template <class T> int
 ACE_Ordered_MultiSet<T>::insert (const T &item)
 {
-  // ACE_TRACE ("ACE_Ordered_MultiSet<T>::insert");
+// ACE_TRACE ("ACE_Ordered_MultiSet<T>::insert");
 
   return  this->insert_from (item, this->head_, 0);
 }
@@ -2141,7 +1928,7 @@ template <class T> int
 ACE_Ordered_MultiSet<T>::insert (const T &item,
                                  ACE_Ordered_MultiSet_Iterator<T> &iter)
 {
-  // ACE_TRACE ("ACE_Ordered_MultiSet<T>::insert using iterator");
+// ACE_TRACE ("ACE_Ordered_MultiSet<T>::insert using iterator");
 
   return  this->insert_from (item, iter.current_, &iter.current_);
 }
@@ -2149,7 +1936,7 @@ ACE_Ordered_MultiSet<T>::insert (const T &item,
 template <class T> int
 ACE_Ordered_MultiSet<T>::remove (const T &item)
 {
-  // ACE_TRACE ("ACE_Ordered_MultiSet<T>::remove");
+// ACE_TRACE ("ACE_Ordered_MultiSet<T>::remove");
 
   ACE_DNode<T> *node = 0;
 
@@ -2157,33 +1944,33 @@ ACE_Ordered_MultiSet<T>::remove (const T &item)
 
   // if we found the node, remove from list and free it
   if (node && (result == 0))
+  {
+    if (node->prev_)
     {
-      if (node->prev_)
-        {
-          node->prev_->next_ = node->next_;
-        }
-      else
-        {
-          head_ = node->next_;
-        }
+      node->prev_->next_ = node->next_;
+    }
+    else
+    {
+      head_ = node->next_;
+    }
 
-      if (node->next_)
-        {
-          node->next_->prev_ = node->prev_;
-        }
-      else
-        {
-          tail_ = node->prev_;
-        }
+    if (node->next_)
+    {
+      node->next_->prev_ = node->prev_;
+    }
+    else
+    {
+      tail_ = node->prev_;
+    }
 
-      this->cur_size_--;
+    this->cur_size_--;
 
-      ACE_DES_FREE_TEMPLATE (node,
-                             this->allocator_->free,
-                             ACE_DNode,
-                             <T>);
-      return 0;
-    }
+    ACE_DES_FREE_TEMPLATE (node,
+                           this->allocator_->free,
+                           ACE_DNode,
+                           <T>);
+    return 0;
+  }
 
   return -1;
 }
@@ -2198,10 +1985,10 @@ ACE_Ordered_MultiSet<T>::find (const T &item,
 
   // if we found the node, update the iterator and indicate success
   if (node && (result == 0))
-    {
-      iter.current_ = node;
-      return 0;
-    }
+  {
+    iter.current_ = node;
+    return 0;
+  }
 
   return -1;
 }
@@ -2219,31 +2006,31 @@ ACE_Ordered_MultiSet<T>::reset (void)
 template <class T> void
 ACE_Ordered_MultiSet<T>::dump (void) const
 {
-  //  ACE_TRACE ("ACE_Ordered_MultiSet<T>::dump");
-  //
-  //  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  //  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nhead_ = %u"), this->head_));
-  //  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nhead_->next_ = %u"), this->head_->next_));
-  //  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\ncur_size_ = %d\n"), this->cur_size_));
-  //
-  //  T *item = 0;
-  //  size_t count = 1;
-  //
-  //  for (ACE_Ordered_MultiSet_Iterator<T> iter (*(ACE_Ordered_MultiSet<T> *) this);
-  //       iter.next (item) != 0;
-  //       iter.advance ())
-  //    ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("count = %d\n"), count++));
-  //
-  //  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+//  ACE_TRACE ("ACE_Ordered_MultiSet<T>::dump");
+//
+//  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+//  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nhead_ = %u"), this->head_));
+//  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\nhead_->next_ = %u"), this->head_->next_));
+//  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\ncur_size_ = %d\n"), this->cur_size_));
+//
+//  T *item = 0;
+//  size_t count = 1;
+//
+//  for (ACE_Ordered_MultiSet_Iterator<T> iter (*(ACE_Ordered_MultiSet<T> *) this);
+//       iter.next (item) != 0;
+//       iter.advance ())
+//    ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("count = %d\n"), count++));
+//
+//  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 template <class T> int
 ACE_Ordered_MultiSet<T>::insert_from (const T &item, ACE_DNode<T> *position,
                                       ACE_DNode<T> **new_position)
 {
-  // ACE_TRACE ("ACE_Unbounded_Queue<T>::insert_tail");
+// ACE_TRACE ("ACE_Unbounded_Queue<T>::insert_tail");
 
-  // create a new node
+    // create a new node
   ACE_DNode<T> *temp;
   ACE_NEW_MALLOC_RETURN (temp,
                          (ACE_DNode<T>*) this->allocator_->malloc (sizeof (ACE_DNode<T>)),
@@ -2255,70 +2042,70 @@ ACE_Ordered_MultiSet<T>::insert_from (const T &item, ACE_DNode<T> *position,
 
   // if there are nodes in the multiset
   if (position)
+  {
+    switch (result)
     {
-      switch (result)
-        {
-          // insert after the approximate position
-        case -1:
+      // insert after the approximate position
+      case -1:
 
-          // if there is a following node
-          if (position->next_)
-            {
-              // link up with the following node
-              position->next_->prev_ = temp;
-              temp->next_ = position->next_;
-            }
-          else
-            {
-              // appending to the end of the set
-              tail_ = temp;
-            }
-
-          // link up with the preceeding node
-          temp->prev_ = position;
-          position->next_ = temp;
+        // if there is a following node
+        if (position->next_)
+        {
+          // link up with the following node
+          position->next_->prev_ = temp;
+          temp->next_ = position->next_;
+        }
+        else
+        {
+          // appending to the end of the set
+          tail_ = temp;
+        }
 
-          break;
+        // link up with the preceeding node
+        temp->prev_ = position;
+        position->next_ = temp;
 
-          // insert before the position
-        case  0:
-        case  1:
+        break;
 
-          // if there is a preceeding node
-          if (position->prev_)
-            {
-              // link up with the preceeding node
-              position->prev_->next_ = temp;
-              temp->prev_ = position->prev_;
-            }
-          else
-            {
-              // prepending to the start of the set
-              head_ = temp;
-            }
+      // insert before the position
+      case  0:
+      case  1:
 
+        // if there is a preceeding node
+        if (position->prev_)
+        {
           // link up with the preceeding node
-          temp->next_ = position;
-          position->prev_ = temp;
+          position->prev_->next_ = temp;
+          temp->prev_ = position->prev_;
+        }
+        else
+        {
+          // prepending to the start of the set
+          head_ = temp;
+        }
 
-          break;
+        // link up with the preceeding node
+        temp->next_ = position;
+        position->prev_ = temp;
 
-        default:
-          return -1;
-        }
+        break;
+
+      default:
+        return -1;
     }
+  }
   else
-    {
-      // point the head and tail to the new node.
-      this->head_ = temp;
-      this->tail_ = temp;
-    }
+  {
+    // point the head and tail to the new node.
+    this->head_ = temp;
+    this->tail_ = temp;
+  }
 
   this->cur_size_++;
   if (new_position)
-    {
-      *new_position = temp;
-    }
+  {
+    *new_position = temp;
+  }
 
   return 0;
 }
@@ -2328,56 +2115,56 @@ ACE_Ordered_MultiSet<T>::locate (const T &item, ACE_DNode<T> *start_position,
                                  ACE_DNode<T> *&new_position) const
 {
   if (! start_position)
-    {
-      start_position = this->head_;
-    }
+  {
+    start_position = this->head_;
+  }
 
   // if starting before the item, move forward
   // until at or just before item
   while (start_position && start_position->item_ < item &&
          start_position->next_)
-    {
-      start_position = start_position->next_;
-    }
+  {
+    start_position = start_position->next_;
+  }
 
   // if starting after the item, move back
   // until at or just after item
   while (start_position && item < start_position->item_ &&
          start_position->prev_)
-    {
-      start_position = start_position->prev_;
-    }
+  {
+    start_position = start_position->prev_;
+  }
 
   // save the (approximate) location in the passed pointer
   new_position = start_position;
 
   // show the location is after (1), before (-1) , or at (0) the item
   if (! new_position )
-    {
-      return 1;
-    }
+  {
+    return 1;
+  }
   else if (item < new_position->item_)
-    {
-      return 1;
-    }
+  {
+    return 1;
+  }
   else if (new_position->item_ < item)
-    {
-      return -1;
-    }
+  {
+    return -1;
+  }
   else
-    {
-      return 0;
-    }
-}
-// looks for first occurance of <item> in the ordered set, using the
-// passed starting position as a hint: if there is such an instance, it
-// updates the new_position pointer to point to one such node and returns 0;
-// if there is no such node, then if there is a node before where the
-// item would have been, it updates the new_position pointer to point
-// to this node and returns -1; if there is no such node, then if there
-// is a node after where the item would have been, it updates the
-// new_position pointer to point to this node (or 0 if there is no such
-// node) and returns 1;
+  {
+    return 0;
+  }
+}
+  // looks for first occurance of <item> in the ordered set, using the
+  // passed starting position as a hint: if there is such an instance, it
+  // updates the new_position pointer to point to one such node and returns 0;
+  // if there is no such node, then if there is a node before where the
+  // item would have been, it updates the new_position pointer to point
+  // to this node and returns -1; if there is no such node, then if there
+  // is a node after where the item would have been, it updates the
+  // new_position pointer to point to this node (or 0 if there is no such
+  // node) and returns 1;
 
 template <class T> void
 ACE_Ordered_MultiSet<T>::copy_nodes (const ACE_Ordered_MultiSet<T> &us)
@@ -2387,9 +2174,9 @@ ACE_Ordered_MultiSet<T>::copy_nodes (const ACE_Ordered_MultiSet<T> &us)
   for (ACE_DNode<T> *curr = us.head_;
        curr;
        curr = curr->next_)
-    {
-      this->insert_from (curr->item_, insertion_point, &insertion_point);
-    }
+  {
+    this->insert_from (curr->item_, insertion_point, &insertion_point);
+  }
 }
 
 template <class T> void
@@ -2415,30 +2202,30 @@ ACE_Ordered_MultiSet<T>::delete_nodes (void)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Ordered_MultiSet_Iterator)
 
-  template <class T>
+template <class T>
 ACE_Ordered_MultiSet_Iterator<T>::ACE_Ordered_MultiSet_Iterator (ACE_Ordered_MultiSet<T> &s)
-  : current_ (s.head_),
-    set_ (s)
+    : current_ (s.head_),
+      set_ (s)
 {
-  // ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::ACE_Ordered_MultiSet_Iterator");
+// ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::ACE_Ordered_MultiSet_Iterator");
 }
 
-template <class T> int
+ template <class T> int
 ACE_Ordered_MultiSet_Iterator<T>::next (T *&item) const
 {
-  // ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::next");
+// ACE_TRACE ("ACE_Ordered_MultiSet_Iterator<T>::next");
   if (this->current_)
-    {
-      item = &this->current_->item_;
-      return 1;
-    }
+  {
+    item = &this->current_->item_;
+    return 1;
+  }
 
   return 0;
 }
 
 ACE_ALLOC_HOOK_DEFINE (ACE_DLList_Node)
 
-  template <class T> T *
+template <class T> T *
 ACE_DLList<T>::insert_tail (T *new_item)
 {
   ACE_DLList_Node *temp1, *temp2;
@@ -2456,9 +2243,9 @@ ACE_DLList<T>::insert_head (T *new_item)
 {
   ACE_DLList_Node *temp1, *temp2;
   ACE_NEW_MALLOC_RETURN (
-                         temp1,
-                         (ACE_DLList_Node *) this->allocator_->malloc (sizeof (ACE_DLList_Node)),
-                         ACE_DLList_Node ((void *&)new_item), 0);
+    temp1,
+    (ACE_DLList_Node *) this->allocator_->malloc (sizeof (ACE_DLList_Node)),
+    ACE_DLList_Node ((void *&)new_item), 0);
 
   temp2 = ACE_DLList_Base::insert_head (temp1);
   return (T *) (temp2 ? temp2->item_ : 0);
@@ -2541,9 +2328,9 @@ ACE_Array_Base<T>::ACE_Array_Base (size_t size,
 
 template <class T>
 ACE_Array_Base<T>::ACE_Array_Base (const ACE_Array_Base<T> &s)
-  : max_size_ (s.size ()),
-    cur_size_ (s.size ()),
-    allocator_ (s.allocator_)
+   : max_size_ (s.size ()),
+     cur_size_ (s.size ()),
+     allocator_ (s.allocator_)
 {
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -2604,15 +2391,15 @@ ACE_Array_Base<T>::set (const T &new_item, size_t slot)
 template <class T> int
 ACE_Array_Base<T>::get (T &item, size_t slot) const
 {
-  if (this->in_range (slot))
-    {
-      // Copies the item.  If you don't want to copy, use operator []
-      // instead (but then you'll be responsible for range checking).
-      item = this->array_[slot];
-      return 0;
-    }
-  else
-    return -1;
+   if (this->in_range (slot))
+     {
+       // Copies the item.  If you don't want to copy, use operator []
+       // instead (but then you'll be responsible for range checking).
+       item = this->array_[slot];
+       return 0;
+     }
+   else
+     return -1;
 }
 
 template<class T> int
@@ -2628,7 +2415,7 @@ ACE_Array_Base<T>::max_size (size_t new_size)
                              -1);
 
       for (size_t i = 0; i < this->cur_size_; ++i)
-        new (&tmp[i]) T (this->array_[i]);
+         new (&tmp[i]) T (this->array_[i]);
 
       // Initialize the new portion of the array that exceeds the
       // previously allocated section.
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index eca8af5e6df..f03482c4daa 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -42,6 +42,7 @@ public:
 
   ACE_Bounded_Stack (size_t size);
   // Initialize a new stack so that it is empty.
+
   ACE_Bounded_Stack (const ACE_Bounded_Stack<T> &s);
   // The copy constructor (performs initialization).
 
@@ -49,7 +50,7 @@ public:
   // Assignment operator (performs assignment).
 
   ~ACE_Bounded_Stack (void);
-  // Perform actions needed when stack goes out of scope.
+ // Perform actions needed when stack goes out of scope.
 
   // = Classic Stack operations.
 
@@ -328,7 +329,7 @@ private:
   // Copy all nodes from <s> to <this>.
 
   ACE_Node<T> *head_;
-  // Head of the linked list of Nodes.
+   // Head of the linked list of Nodes.
 
   size_t cur_size_;
   // Current size of the stack.
@@ -436,7 +437,7 @@ public:
   // Trait definition.
   typedef ACE_Unbounded_Queue_Iterator<T> ITERATOR;
 
-  // = Initialization and termination methods.
+ // = Initialization and termination methods.
   ACE_Unbounded_Queue (ACE_Allocator *alloc = 0);
   // construction.  Use user specified allocation strategy
   // if specified.
@@ -521,108 +522,28 @@ template <class T>
 class ACE_Double_Linked_List;
 
 template <class T>
-class ACE_Double_Linked_List_Iterator_Base
-{
-  // = TITLE
-  //     Implements a common base class for iterators for a double
-  //     linked list ADT
-public:
-  // = Iteration methods.
-
-  int next (T *&) const;
-  // Passes back the <entry> under the iterator. Returns 0 if the
-  // iteration has completed, otherwise 1
-
-  T *next (void) const;
-  // Return the address of next (current) unvisited item in the list.
-  // 0 if there is no more element available.
-  // DEPRECATED
-
-
-  int done (void) const;
-  // Returns 1 when all items have been seen, else 0.
-
-  T & operator* (void) const ;
-  // STL-like iterator dereference operator: returns a reference
-  // to the node underneath the iterator.
-
-  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?
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-protected:
-  // = Initialization methods.
-
-  ACE_Double_Linked_List_Iterator_Base (ACE_Double_Linked_List<T> &);
-  // Constructor
-
-  ACE_Double_Linked_List_Iterator_Base (const
-                                        ACE_Double_Linked_List_Iterator_Base<T> 
-                                        &iter);
-  // Copy constructor.
-
-  // = Iteration methods.
-  int go_head (void);
-  // Move to the first element of the list. Returns 0 if the list is
-  // empty, else 1. Note: the head of the ACE_DLList is actually a
-  // null entry, so the first element is actually the 2n'd entry
-
-  int go_tail (void);
-  // Move to the last element of the list. Returns 0 if the list is
-  // empty, else 1. 
-
-  T *not_done (void) const ;
-  // Check if we reach the end of the list.  Can also be used to get
-  // the *current* element in the list.  Return the address of the
-  // current item if there are still elements left , 0 if we run out
-  // of element.
-    
-  T *do_advance (void);
-  // Advance to the next element in the list.  Return the address of the
-  // next element if there are more, 0 otherwise.
-
-  T *do_retreat (void);
-  // Retreat to the previous element in the list.  Return the address
-  // of the previous element if there are more, 0 otherwise.
-
-  void dump_i (void) const;
-  // Dump the state of an object.
-
-  T *current_;
-  // Remember where we are.
-
-  ACE_Double_Linked_List<T> *dllist_;
-};
-
-template <class T>
-class ACE_Double_Linked_List_Iterator : public ACE_Double_Linked_List_Iterator_Base <T>
+class ACE_Double_Linked_List_Iterator
 {
   // = TITLE
-  //     Implements an iterator for a double linked list ADT
+  //     Implement an iterator over a container double-linked list
   //
   // = DESCRIPTION
-  //     Iterate thru the double-linked list.  This class provides
+  //     Iterate thru the double-linked list.  This class provide
   //     an interface that let users access the internal element
-  //     addresses directly. Notice <class T> must delcare
-  //     ACE_Double_Linked_List<T>,
-  //     ACE_Double_Linked_List_Iterator_Base <T> and
+  //     addresses directly, which (IMHO) seems to break the
+  //     encasulation.  Notice <class T> must delcare
+  //     ACE_Double_Linked_List<T> and
   //     ACE_Double_Linked_List_Iterator as friend classes and class T
   //     should also have data members T* next_ and T* prev_.
 public:
   // = Initialization method.
   ACE_Double_Linked_List_Iterator (ACE_Double_Linked_List<T> &);
 
-  int first (void);
-  // Move to the first element in the list.  Returns 0 if the
-  // list is empty, else 1.
+  // = Iteration methods.
+
+  T *next (void) const;
+  // Return the address of next (current) unvisited item in the list.
+  // 0 if there is no more element available.
 
   int advance (void);
   // Move forward by one element in the list.  Returns 0 when all the
@@ -634,79 +555,34 @@ public:
   // <dont_remove> equals 0, this function behaves like advance() but
   // return 0 (NULL) instead.
 
-  // = STL-style iteration methods 
+  int first (void);
+  // Move to the first element in the list.  Returns 0 if the
+  // list is empty, else 1.
 
-  ACE_Double_Linked_List_Iterator<T> & operator++ (void);
-  // Prefix advance.
-  
-  ACE_Double_Linked_List_Iterator<T> operator++ (int);
-  // Postfix advance.
-  
-  ACE_Double_Linked_List_Iterator<T> & operator-- (void);
-  // Prefix reverse.
-  
-  ACE_Double_Linked_List_Iterator<T> operator-- (int);
-  // Postfix reverse.
+  int done (void) const;
+  // Returns 1 when all items have been seen, else 0.
 
   void dump (void) const;
   // Dump the state of an object.
 
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
-};
 
-template <class T>
-class ACE_Double_Linked_List_Reverse_Iterator : public ACE_Double_Linked_List_Iterator_Base <T>
-{
-  // = TITLE
-  //     Implements a reverse iterator for a double linked list ADT
-  //
-  // = DESCRIPTION
-  //     Iterate backwards over the double-linked list.  This class
-  //     provide an interface that let users access the internal
-  //     element addresses directly, which seems to break the
-  //     encapsulation.  Notice <class T> must delcare 
-  //     ACE_Double_Linked_List<T>,
-  //     ACE_Double_Linked_List_Iterator_Base <T> and
-  //     ACE_Double_Linked_List_Iterator as friend classes and class T
-  //     should also have data members T* next_ and T* prev_.
-public:
-  // = Initialization method.
-  ACE_Double_Linked_List_Reverse_Iterator (ACE_Double_Linked_List<T> &);
-
-  int first (void);
-  // Move to the first element in the list.  Returns 0 if the
-  // list is empty, else 1.
-
-  int advance (void);
-  // Move forward by one element in the list.  Returns 0 when all the
-  // items in the list have been seen, else 1.
-  
-  T* advance_and_remove (int dont_remove);
-  // Advance the iterator while removing the original item from the list.
-  // Return a pointer points to the original (removed) item.  If
-  // <dont_remove> equals 0, this function behaves like advance() but
-  // return 0 (NULL) instead.
-
-  // = STL-style iteration methods 
-
-  ACE_Double_Linked_List_Reverse_Iterator<T> & operator++ (void);
-  // Prefix advance.
-  
-  ACE_Double_Linked_List_Reverse_Iterator<T> operator++ (int);
-  // Postfix advance.
+protected:
+  T *not_done (void) const ;
+  // Check if we reach the end of the list.  Can also be used to get
+  // the *current* element in the list.  Return the address of the
+  // current item if there are still elements left , 0 if we run out
+  // of element.
 
-  ACE_Double_Linked_List_Reverse_Iterator<T> & operator-- (void);
-  // Prefix reverse.
-  
-  ACE_Double_Linked_List_Reverse_Iterator<T> operator-- (int);
-  // Postfix reverse.
+  T *do_advance (void);
+  // Advance to the next element in the list.  Return the address of the
+  // next element if there are more, 0 otherwise.
 
-  void dump (void) const;
-  // Dump the state of an object.
+  T *current_;
+  // Remember where we are.
 
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
+  ACE_Double_Linked_List<T> &dllist_;
 };
 
 template <class T>
@@ -721,13 +597,10 @@ class ACE_Double_Linked_List
   //     like the ACE_Unbounded_Queue except that it allows removing
   //     of a specific element from a specific location.
 public:
-  friend class ACE_Double_Linked_List_Iterator_Base<T>;
   friend class ACE_Double_Linked_List_Iterator<T>;
-  friend class ACE_Double_Linked_List_Reverse_Iterator<T>;
 
   // Trait definition.
   typedef ACE_Double_Linked_List_Iterator<T> ITERATOR;
-  typedef ACE_Double_Linked_List_Reverse_Iterator<T> REVERSE_ITERATOR;
 
   // = Initialization and termination methods.
   ACE_Double_Linked_List (ACE_Allocator *alloc = 0);
@@ -831,21 +704,11 @@ protected:
 
 template <class T> class ACE_DLList;
 template <class T> class ACE_DLList_Iterator;
-template <class T> class ACE_DLList_Reverse_Iterator;
-
-typedef ACE_Double_Linked_List<ACE_DLList_Node> ACE_DLList_Base;
-
-//typedef ACE_Double_Linked_List_Iterator <ACE_DLList_Node>
-//        ACE_DLList_Iterator_Base;
-//typedef ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>
-//        ACE_DLList_Reverse_Iterator_Base;
-//@@ These two typedefs (inherited from James Hu's original design)
-// have been removed because Sun CC 4.2 had problems with it. I guess
-// having the DLList_Iterators inheriting from a class which is
-// actually a typedef leads to problems. #define'ing rather than
-// typedef'ing worked, but as per Carlos's reccomendation, I'm just
-// replacing all references to the base classes with their actual
-// type.  Matt Braun (6/15/99)
+
+typedef ACE_Double_Linked_List<ACE_DLList_Node>
+        ACE_DLList_Base;
+typedef ACE_Double_Linked_List_Iterator<ACE_DLList_Node>
+        ACE_DLList_Iterator_Base;
 
 template <class T>
 class ACE_DLList : public ACE_DLList_Base
@@ -859,9 +722,7 @@ class ACE_DLList : public ACE_DLList_Base
   //     calls to ACE_Double_Linked_List.
 
   friend class ACE_DLList_Node;
-  friend class ACE_Double_Linked_List_Iterator<T>;
   friend class ACE_DLList_Iterator<T>;
-  friend class ACE_DLList_Reverse_Iterator<T>;
 
 public:
   void operator= (ACE_DLList<T> &l);
@@ -884,9 +745,7 @@ public:
   // = Additional utility methods.
 
   int get (T *&item, size_t slot = 0);
-  // Delegates to ACE_Double_Linked_List, but where
-  // ACE_Double_Linked_List returns the node as the item, this get
-  // returns the contents of the node in item.
+  // Delegates to ACE_Double_Linked_List.
 
   void dump (void) const;
   // Delegates to ACE_Double_Linked_List.
@@ -908,7 +767,7 @@ public:
 };
 
 template <class T>
-class ACE_DLList_Iterator : public ACE_Double_Linked_List_Iterator <ACE_DLList_Node>
+class ACE_DLList_Iterator : public ACE_DLList_Iterator_Base
 {
   // = TITLE
   //     A double-linked list container class iterator.
@@ -927,48 +786,6 @@ public:
   ACE_DLList_Iterator (ACE_DLList<T> &l);
 
   // = 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.
-
-  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
-  
-  int remove (void);
-  // Removes the current item (i.e., this->next()) from the list.
-  
-  void dump (void) const;
-  // Delegates to ACE_Double_Linked_List_Iterator.
-
-private:
-  ACE_DLList<T> &list_;
-};
-
-template <class T>
-class ACE_DLList_Reverse_Iterator : public ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>
-{
-  // = TITLE
-  //     A double-linked list container class iterator.
-  //
-  // = DESCRIPTION
-  //     This implementation uses ACE_Double_Linked_List_Iterator to
-  //     perform the logic behind this container class.  It delegates
-  //     all of its calls to ACE_Double_Linked_List_Iterator.
-
-  friend class ACE_DLList<T>;
-  friend class ACE_DLList_Node;
-
-public:
-
-  // = Initialization method.
-  ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l);
-
-  // = 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.
 
   T *next (void) const;
   // Delegates to ACE_Double_Linked_List_Iterator.
@@ -1122,7 +939,7 @@ private:
   // Copy nodes into this set.
 
   ACE_Node<T> *head_;
-  // Head of the linked list of Nodes.
+   // Head of the linked list of Nodes.
 
   size_t cur_size_;
   // Current size of the set.
@@ -1548,10 +1365,10 @@ private:
   // Copy nodes into this set.
 
   ACE_DNode<T> *head_;
-  // Head of the bilinked list of Nodes.
+   // Head of the bilinked list of Nodes.
 
   ACE_DNode<T> *tail_;
-  // Head of the bilinked list of Nodes.
+   // Head of the bilinked list of Nodes.
 
   size_t cur_size_;
   // Current size of the set.
diff --git a/ace/Containers_T.i b/ace/Containers_T.i
index 78cfdb03dfe..9d59bf2ee0a 100644
--- a/ace/Containers_T.i
+++ b/ace/Containers_T.i
@@ -480,17 +480,9 @@ ACE_DLList<T>::~ACE_DLList (void)
   while (this->delete_head ()) ;
 }
 
-template <class T> ACE_INLINE int
-ACE_DLList_Iterator<T>::remove (void)
-{
-  ACE_DLList_Node *temp = this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::next ();
-  this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::advance ();
-  return dllist_->remove (temp);
-}
-
 template <class T> ACE_INLINE
 ACE_DLList_Iterator<T>::ACE_DLList_Iterator (ACE_DLList<T> &l)
-  : ACE_Double_Linked_List_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l),
+  : ACE_DLList_Iterator_Base ((ACE_DLList_Base &)l),
     list_ (l)
 {
 }
@@ -498,54 +490,20 @@ ACE_DLList_Iterator<T>::ACE_DLList_Iterator (ACE_DLList<T> &l)
 template <class T> ACE_INLINE T *
 ACE_DLList_Iterator<T>::next (void) const
 {
-  ACE_DLList_Node *temp = ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::next ();
+  ACE_DLList_Node *temp = ACE_DLList_Iterator_Base::next ();
   return (T *) (temp ? temp->item_ : 0);
 }
 
 template <class T> ACE_INLINE int
-ACE_DLList_Iterator<T>::advance (void)
+ACE_DLList_Iterator<T>::remove (void)
 {
-  return this->ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::advance ();
+  ACE_DLList_Node *temp = ACE_DLList_Iterator_Base::next ();
+  ACE_DLList_Iterator_Base::advance ();
+  return this->list_.remove (temp);
 }
 
 template <class T> ACE_INLINE void
 ACE_DLList_Iterator<T>::dump (void) const
 {
-  ACE_Double_Linked_List_Iterator <ACE_DLList_Node>::dump ();
-}
-
-
-template <class T> ACE_INLINE int
-ACE_DLList_Reverse_Iterator<T>::remove (void)
-{
-  ACE_DLList_Node *temp = ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::next ();
-  this->ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::advance ();
-  return dllist_->remove (temp);
-}
-
-template <class T> ACE_INLINE
-ACE_DLList_Reverse_Iterator<T>::ACE_DLList_Reverse_Iterator (ACE_DLList<T> &l)
-  : ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node> ((ACE_DLList_Base &)l),
-    list_ (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 T *
-ACE_DLList_Reverse_Iterator<T>::next (void) const
-{
-  ACE_DLList_Node *temp = ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::next ();
-  return (T *) (temp ? temp->item_ : 0);
-}
-
-
-template <class T> ACE_INLINE void
-ACE_DLList_Reverse_Iterator<T>::dump (void) const
-{
-  ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>::dump ();
+  ACE_DLList_Iterator_Base::dump ();
 }
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_Addr.cpp b/ace/DEV_Addr.cpp
index 60652735fcc..c99a82144d1 100644
--- a/ace/DEV_Addr.cpp
+++ b/ace/DEV_Addr.cpp
@@ -52,7 +52,6 @@ ACE_DEV_Addr::set (const ACE_DEV_Addr &sa)
 // Copy constructor. 
 
 ACE_DEV_Addr::ACE_DEV_Addr (const ACE_DEV_Addr &sa)
-  : ACE_Addr (AF_DEV, sizeof this->devname_)
 {
   ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr");
 
@@ -60,7 +59,6 @@ ACE_DEV_Addr::ACE_DEV_Addr (const ACE_DEV_Addr &sa)
 }
 
 ACE_DEV_Addr::ACE_DEV_Addr (LPCTSTR devname)
-  : ACE_Addr (AF_DEV, sizeof this->devname_)
 {
   ACE_TRACE ("ACE_DEV_Addr::ACE_DEV_Addr");
 
diff --git a/ace/Dirent.i b/ace/Dirent.i
index 0503442de09..dceba821fa6 100644
--- a/ace/Dirent.i
+++ b/ace/Dirent.i
@@ -30,8 +30,7 @@ ACE_Dirent::ACE_Dirent (const char *dirname)
 ACE_INLINE 
 ACE_Dirent::~ACE_Dirent (void)
 {
-  if (this->dirp_ != 0)
-    ACE_OS::closedir (this->dirp_);
+  ACE_OS::closedir (this->dirp_);
 }
 
 ACE_INLINE dirent *
@@ -52,8 +51,7 @@ ACE_Dirent::read (struct dirent *entry,
 ACE_INLINE void
 ACE_Dirent::close (void)
 {
-  if (this->dirp_ != 0)
-    ACE_OS::closedir (this->dirp_);
+  ACE_OS::closedir (this->dirp_);
 }
 
 ACE_INLINE void
diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h
index 3921321985f..be8879c092c 100644
--- a/ace/Env_Value_T.h
+++ b/ace/Env_Value_T.h
@@ -101,12 +101,6 @@ ACE_Convert (const char *s, char *&v)
 }
 
 inline void
-ACE_Convert (const char *s, const char *&v)
-{
-  v = (const char *) s;
-}
-
-inline void
 ACE_Convert (const char *s, short &si)
 {
   si = ACE_static_cast (short, ACE_OS::strtol (s, 0, 10));
diff --git a/ace/FILE_Addr.cpp b/ace/FILE_Addr.cpp
index 17e90a1ed48..80ccd9aff65 100644
--- a/ace/FILE_Addr.cpp
+++ b/ace/FILE_Addr.cpp
@@ -44,7 +44,6 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa)
 // Copy constructor.
 
 ACE_FILE_Addr::ACE_FILE_Addr (const ACE_FILE_Addr &sa)
-  : ACE_Addr (AF_FILE, sizeof this->filename_)
 {
   this->set (sa);
 }
diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp
index 9f5a848bcce..3486629e491 100644
--- a/ace/FILE_IO.cpp
+++ b/ace/FILE_IO.cpp
@@ -127,3 +127,4 @@ ACE_FILE_IO::recvv (iovec *io_vec)
   else
     return length;
 }
+
diff --git a/ace/Functor.h b/ace/Functor.h
index c119b86a493..a66788ab876 100644
--- a/ace/Functor.h
+++ b/ace/Functor.h
@@ -115,60 +115,77 @@ public:
   // Simply returns t
 };
 
+ACE_TEMPLATE_SPECIALIZATION
+class ACE_Export ACE_Hash<short>
+{
+  // = TITLE
+  //     Function object for hashing a short
+public:
+  u_long operator () (short t) const;
+  // Simply returns t
+};
 
-// @@ ADD HASHES FOR ACE TYPES
+ACE_TEMPLATE_SPECIALIZATION
+class ACE_Export ACE_Hash<unsigned short>
+{
+  // = TITLE
+  //     Function object for hashing an unsigned short
+public:
+  u_long operator () (unsigned short t) const;
+  // Simply returns t
+};
 
 ACE_TEMPLATE_SPECIALIZATION
-class ACE_Export ACE_Hash<ACE_INT16>
+class ACE_Export ACE_Hash<int>
 {
   // = TITLE
-  //     Function object for hashing a 16-bit signed number
+  //     Function object for hashing an int
 public:
-  u_long operator () (ACE_INT16 t) const;
+  u_long operator () (int t) const;
   // Simply returns t
 };
 
 ACE_TEMPLATE_SPECIALIZATION
-class ACE_Export ACE_Hash<ACE_UINT16>
+class ACE_Export ACE_Hash<unsigned int>
 {
   // = TITLE
-  //     Function object for hashing a 16-bit unsigned number
+  //     Function object for hashing an unsigned int
 public:
-  u_long operator () (ACE_UINT16 t) const;
+  u_long operator () (unsigned int t) const;
   // Simply returns t
 };
 
 ACE_TEMPLATE_SPECIALIZATION
-class ACE_Export ACE_Hash<ACE_INT32>
+class ACE_Export ACE_Hash<long>
 {
   // = TITLE
-  //     Function object for hashing a 32-bit signed number
+  //     Function object for hashing a long
 public:
-  u_long operator () (ACE_INT32 t) const;
+  u_long operator () (long t) const;
   // Simply returns t
 };
 
 ACE_TEMPLATE_SPECIALIZATION
-class ACE_Export ACE_Hash<ACE_UINT32>
+class ACE_Export ACE_Hash<unsigned long>
 {
   // = TITLE
-  //     Function object for hashing a 32-bit unsigned number
+  //     Function object for hashing an unsigned long
 public:
-  u_long operator () (ACE_UINT32 t) const;
+  u_long operator () (unsigned long t) const;
   // Simply returns t
 };
 
+#if ACE_SIZEOF_LONG != 8
 ACE_TEMPLATE_SPECIALIZATION
 class ACE_Export ACE_Hash<ACE_UINT64>
 {
   // = TITLE
-  //     Function object for hashing a 64-bit unsigned number
+  //     Function object for hashing an unsigned long
 public:
   u_long operator () (ACE_UINT64 t) const;
   // Simply returns t
 };
-
-// @@ DONE ADDING HASHES FOR ACE TYPES
+#endif /* ACE_SIZEOF_LONG != 8 */
 
 ACE_TEMPLATE_SPECIALIZATION
 class ACE_Export ACE_Hash<const char *>
diff --git a/ace/Functor.i b/ace/Functor.i
index abb2ca799a7..8703043412a 100644
--- a/ace/Functor.i
+++ b/ace/Functor.i
@@ -70,35 +70,48 @@ ACE_Hash<unsigned char>::operator () (unsigned char t) const
 }
 
 ACE_INLINE u_long
-ACE_Hash<ACE_INT16>::operator () (ACE_INT16 t) const
+ACE_Hash<short>::operator () (short t) const
 {
   return t;
 }
 
 ACE_INLINE u_long
-ACE_Hash<ACE_UINT16>::operator () (ACE_UINT16 t) const
+ACE_Hash<unsigned short>::operator () (unsigned short t) const
 {
   return t;
 }
 
 ACE_INLINE u_long
-ACE_Hash<ACE_INT32>::operator () (ACE_INT32 t) const
+ACE_Hash<int>::operator () (int t) const
 {
   return t;
 }
 
 ACE_INLINE u_long
-ACE_Hash<ACE_UINT32>::operator () (ACE_UINT32 t) const
+ACE_Hash<unsigned int>::operator () (unsigned int t) const
 {
   return t;
 }
 
 ACE_INLINE u_long
+ACE_Hash<long>::operator () (long t) const
+{
+  return t;
+}
+
+ACE_INLINE u_long
+ACE_Hash<unsigned long>::operator () (unsigned long t) const
+{
+  return t;
+}
+
+#if ACE_SIZEOF_LONG != 8
+ACE_INLINE u_long
 ACE_Hash<ACE_UINT64>::operator () (ACE_UINT64 t) const
 {
   return ACE_U64_TO_U32 (t);
 }
-
+#endif /* ACE_SIZEOF_LONG != 8 */
 
 ACE_INLINE u_long
 ACE_Hash<const char *>::operator () (const char *t) const
diff --git a/ace/Hash_Cache_Map_Manager_T.cpp b/ace/Hash_Cache_Map_Manager_T.cpp
index e09f09e3466..614b8d99528 100644
--- a/ace/Hash_Cache_Map_Manager_T.cpp
+++ b/ace/Hash_Cache_Map_Manager_T.cpp
@@ -19,30 +19,27 @@ ACE_RCSID(ace, Hash_Cache_Map_Manager_T, "$Id$")
 
 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 (size_t size,
-                                                             ACE_Allocator *alloc,
-                                                             CACHING_STRATEGY *caching_s,
-                                                             int delete_caching_strategy)
-  : ACE_HCMM_BASE (size,
-                   alloc,
-                   caching_s,
-                   delete_caching_strategy)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> 
+ACE_Hash_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::ACE_Hash_Cache_Map_Manager (size_t size,
+                                                                                                                           ACE_Allocator *alloc,
+                                                                                                                           CACHING_STRATEGY *caching_s,
+                                                                                                                           int delete_caching_strategy)
+  : ACE_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>, CACHING_STRATEGY, ATTRIBUTES> (size,
+                                                                                                                                                                                                alloc,
+                                                                                                                                                                                                caching_s,
+                                                                                                                                                                                                delete_caching_strategy)
 {
 }
 
-template <T_1>
-ACE_Hash_Cache_Map_Manager<T_2>::~ACE_Hash_Cache_Map_Manager (void)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES>
+ACE_Hash_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::~ACE_Hash_Cache_Map_Manager (void)
 {
 }
 
-template <T_1> int
-ACE_Hash_Cache_Map_Manager<T_2>:: bind (const KEY &key,
-                                        const VALUE &value,
-                                        ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>:: bind (const KEY &key,
+                                                                                                     const VALUE &value,
+                                                                                                     ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::CACHE_ENTRY *&entry)
 {
   // Insert a entry which has the <key> and the <cache_value> which is
   // the combination of the <value> and the attributes of the caching
@@ -75,10 +72,10 @@ ACE_Hash_Cache_Map_Manager<T_2>:: bind (const KEY &key,
   return bind_result;
 }
 
-template <T_1> int
-ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
-                                         const VALUE &value,
-                                         ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::rebind (const KEY &key,
+                                                                                                      const VALUE &value,
+                                                                                                      ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::CACHE_ENTRY *&entry)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_->attributes ());
@@ -113,10 +110,10 @@ ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
   return rebind_result;
 }
 
-template <T_1> int
-ACE_Hash_Cache_Map_Manager<T_2>::trybind (const KEY &key,
-                                          VALUE &value,
-                                          ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::trybind (const KEY &key,
+                                                                                                       VALUE &value,
+                                                                                                       ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::CACHE_ENTRY *&entry)
 {
   CACHE_VALUE cache_value (value,
                            this->caching_strategy_->attributes ());
@@ -156,9 +153,9 @@ ACE_Hash_Cache_Map_Manager<T_2>::trybind (const KEY &key,
   return trybind_result;
 }
 
-template <T_1> int
-ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
-                                       ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::find (const KEY &key,
+                                                                                                    ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::CACHE_ENTRY *&entry)
 {
   // Lookup the key and populate the <value>.
   int find_result = this->map_.find (key,
@@ -182,8 +179,8 @@ ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
   return find_result;
 }
 
-template <T_1> int
-ACE_Hash_Cache_Map_Manager<T_2>::unbind (ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *entry)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::unbind (ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::CACHE_ENTRY *entry)
 {
   // Remove the entry from the cache.
   int unbind_result = this->map_.unbind (entry);
@@ -202,7 +199,4 @@ ACE_Hash_Cache_Map_Manager<T_2>::unbind (ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE,
   return unbind_result;
 }
 
-#undef T_1
-#undef T_2
-
 #endif /* ACE_HASH_CACHE_MAP_MANAGER_T_C */
diff --git a/ace/Hash_Cache_Map_Manager_T.h b/ace/Hash_Cache_Map_Manager_T.h
index 7d1c06f9f77..f3d149ff5f8 100644
--- a/ace/Hash_Cache_Map_Manager_T.h
+++ b/ace/Hash_Cache_Map_Manager_T.h
@@ -28,10 +28,8 @@
 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, HASH_KEY, COMPARE_KEYS,
                                    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>,
                                    CACHING_STRATEGY, ATTRIBUTES>
 {
   // = TITLE
@@ -59,6 +57,9 @@ class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE,
   typedef ACE_Hash_Map_Entry<KEY, CACHE_VALUE> CACHE_ENTRY;
   typedef KEY key_type;
   typedef VALUE mapped_type;
+  typedef ACE_TYPENAME HASH_MAP::ITERATOR IMPLEMENTATION;
+  typedef ACE_TYPENAME HASH_MAP::REVERSE_ITERATOR REVERSE_IMPLEMENTATION;
+
   // The actual value mapped to the key in the map. The <attributes>
   // are used by the strategy and is transparent to the user of this
   // class.
@@ -165,11 +166,9 @@ class ACE_Hash_Cache_Map_Manager : public ACE_Cache_Map_Manager< KEY, VALUE,
 
 protected:
 
-  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>,
-                                CACHING_STRATEGY, ATTRIBUTES>
+  typedef ACE_Cache_Map_Manager< KEY, VALUE, HASH_KEY, COMPARE_KEYS,
+                                 ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>,
+                                 CACHING_STRATEGY, ATTRIBUTES>
     ACE_HCMM_BASE;
   // Base class.
 };
diff --git a/ace/Hash_Cache_Map_Manager_T.i b/ace/Hash_Cache_Map_Manager_T.i
index 0b1b691fd2c..d4c612f3ca1 100644
--- a/ace/Hash_Cache_Map_Manager_T.i
+++ b/ace/Hash_Cache_Map_Manager_T.i
@@ -1,40 +1,37 @@
 /* -*- C++ -*- */
 // $Id$
 
-#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_INLINE int
-ACE_Hash_Cache_Map_Manager<T_2>::bind (const KEY &key,
-                                       const VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::bind (const KEY &key,
+                                                                                                    const VALUE &value)
 {
   return ACE_HCMM_BASE::bind (key, 
                               value);
 }
 
-template <T_1> ACE_INLINE int
-ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
-                                         const VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::rebind (const KEY &key,
+                                                                                                      const VALUE &value)
 {
   return ACE_HCMM_BASE::rebind (key, 
                                 value);                      
 }
 
-template <T_1> ACE_INLINE int
-ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
-                                         const VALUE &value,
-                                         VALUE &old_value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::rebind (const KEY &key,
+                                                                                                      const VALUE &value,
+                                                                                                      VALUE &old_value)
 {
   return ACE_HCMM_BASE::rebind (key, 
                                 value,
                                 old_value);
 }
 
-template <T_1> ACE_INLINE int
-ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
-                                         const VALUE &value,
-                                         KEY &old_key,
-                                         VALUE &old_value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::rebind (const KEY &key,
+                                                                                                      const VALUE &value,
+                                                                                                      KEY &old_key,
+                                                                                                      VALUE &old_value)
 {
   return ACE_HCMM_BASE::rebind (key,
                                 value,
@@ -42,41 +39,39 @@ ACE_Hash_Cache_Map_Manager<T_2>::rebind (const KEY &key,
                                 old_value);
 }
 
-template <T_1> ACE_INLINE int
-ACE_Hash_Cache_Map_Manager<T_2>::trybind (const KEY &key,
-                                          VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::trybind (const KEY &key,
+                                                                                                       VALUE &value)
 {
   return ACE_HCMM_BASE::trybind (key,
                                  value);
 }
 
-template <T_1> ACE_INLINE int
-ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key,
-                                       VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::find (const KEY &key,
+                                                                                                    VALUE &value)
 {
   return ACE_HCMM_BASE::find (key,
                               value);
 }
 
-template <T_1> ACE_INLINE int
-ACE_Hash_Cache_Map_Manager<T_2>::find (const KEY &key)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::find (const KEY &key)
 {
   return ACE_HCMM_BASE::find (key);
 }
 
-template <T_1> ACE_INLINE int
-ACE_Hash_Cache_Map_Manager<T_2>::unbind (const KEY &key)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::unbind (const KEY &key)
 {
   return ACE_HCMM_BASE::unbind (key);
 }
 
-template <T_1> ACE_INLINE int
-ACE_Hash_Cache_Map_Manager<T_2>::unbind (const KEY &key,
-                                         VALUE &value)
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY, class ATTRIBUTES> ACE_INLINE int
+ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY, ATTRIBUTES>::unbind (const KEY &key,
+                                                                                                      VALUE &value)
 {
   return ACE_HCMM_BASE::unbind (key,
                                 value);
 }
 
-#undef T_1
-#undef T_2
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 503e52dcdbb..341863d32c4 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -165,7 +165,6 @@ ACE_INET_Addr::set (const ASYS_TCHAR address[])
 }
 
 ACE_INET_Addr::ACE_INET_Addr (const ASYS_TCHAR address[])
-  : ACE_Addr (AF_INET, sizeof this->inet_addr_)
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->set (address);
@@ -174,7 +173,6 @@ ACE_INET_Addr::ACE_INET_Addr (const ASYS_TCHAR address[])
 // Copy constructor.
 
 ACE_INET_Addr::ACE_INET_Addr (const ACE_INET_Addr &sa)
-  : ACE_Addr (AF_INET, sizeof this->inet_addr_)
 {
   ACE_TRACE ("ACE_INET_Addr::ACE_INET_Addr");
   this->set (sa);
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index 4958e08e0ed..1d62735b875 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -28,8 +28,7 @@
 class ACE_Export ACE_INET_Addr : public ACE_Addr
 {
   // = TITLE
-  //    Defines a C++ wrapper facade for the Internet domain address
-  //    family format.
+  //    Defines the Internet domain address family address format.
 public:
   // = Initialization methods.
   ACE_INET_Addr (void);
@@ -52,19 +51,16 @@ public:
   // is assumed to be a port number, with the IP address being
   // INADDR_ANY.
 
-  ACE_INET_Addr (u_short port_number,
-		 ACE_UINT32 ip_addr  = INADDR_ANY);
+  ACE_INET_Addr (u_short port_number, ACE_UINT32 ip_addr  = INADDR_ANY);
   // Creates an <ACE_INET_Addr> from a <port_number> and an Internet
   // <ip_addr>.  This method assumes that <port_number> and <ip_addr>
   // are in host byte order.
 
-  ACE_INET_Addr (const ASYS_TCHAR port_name[],
-		 const ASYS_TCHAR host_name[]);
+  ACE_INET_Addr (const ASYS_TCHAR port_name[], const ASYS_TCHAR host_name[]);
   // Uses <getservbyname> to create an <ACE_INET_Addr> from a
   // <port_name> and the remote <host_name>.
 
-  ACE_INET_Addr (const ASYS_TCHAR port_name[],
-		 ACE_UINT32 ip_addr);
+  ACE_INET_Addr (const ASYS_TCHAR port_name[], ACE_UINT32 ip_addr);
   // Uses <getservbyname> to create an <ACE_INET_Addr> from a
   // <port_name> and an Internet <ip_addr>.  This method assumes that
   // <ip_addr> is in host byte order.
@@ -72,15 +68,12 @@ public:
   ~ACE_INET_Addr (void);
   // Default dtor.
 
-  // = Direct initialization methods.
-
-  // These methods are useful after the object has been constructed.
-
+  // = Direct initialization methods (useful after the object has been
+  // constructed).
   int set (const ACE_INET_Addr &);
   // Initializes from another <ACE_INET_Addr>.
 
-  int set (u_short port_number,
-	   const ASYS_TCHAR host_name[],
+  int set (u_short port_number, const ASYS_TCHAR host_name[],
            int encode = 1);
   // Initializes an <ACE_INET_Addr> from a <port_number> and the
   // remote <host_name>.  If <encode> is enabled then <port_number> is
@@ -96,13 +89,11 @@ public:
   // they are assumed to be in network byte order already and are
   // passed straight through.
 
-  int set (const ASYS_TCHAR port_name[],
-	   const ASYS_TCHAR host_name[]);
+  int set (const ASYS_TCHAR port_name[], const ASYS_TCHAR host_name[]);
   // Uses <getservbyname> to initialize an <ACE_INET_Addr> from a
   // <port_name> and the remote <host_name>.
 
-  int set (const ASYS_TCHAR port_name[],
-	   ACE_UINT32 ip_addr);
+  int set (const ASYS_TCHAR port_name[], ACE_UINT32 ip_addr);
   // Uses <getservbyname> to initialize an <ACE_INET_Addr> from a
   // <port_name> and an Internet address.  This assumes that <ip_addr>
   // is already in network byte order.
@@ -114,8 +105,7 @@ public:
   // is assumed to be a port number, with the IP address being
   // INADDR_ANY.
 
-  int set (const sockaddr_in *, 
-	   int len);
+  int set (const sockaddr_in *, int len);
   // Creates an <ACE_INET_Addr> from a sockaddr_in structure.
 
   virtual void *get_addr (void) const;
@@ -143,8 +133,7 @@ public:
   // is no ':' in the <address> it is assumed to be a port number,
   // with the IP address being INADDR_ANY.
 
-  void set_port_number (u_short,
-			int encode = 1);
+  void set_port_number (u_short, int encode = 1);
   // Sets the port number without affecting the host name.  If
   // <encode> is enabled then <port_number> is converted into network
   // byte order, otherwise it is assumed to be in network byte order
diff --git a/ace/LSOCK_Acceptor.cpp b/ace/LSOCK_Acceptor.cpp
index fad95eca458..1e6b696eeda 100644
--- a/ace/LSOCK_Acceptor.cpp
+++ b/ace/LSOCK_Acceptor.cpp
@@ -67,61 +67,25 @@ ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (const ACE_Addr &remote_sap,
 					int protocol)
 {
   ACE_TRACE ("ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor");
-  if (this->open (remote_sap,
-		  reuse_addr,
-		  protocol_family,
-		  backlog,
-		  protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
-		"ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor"));
+  if (this->open (remote_sap, reuse_addr,
+		  protocol_family, backlog, protocol) == -1)
+    ACE_ERROR ((LM_ERROR, "ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor"));
 }
 
 // General purpose routine for accepting new connections.
 
 int
-ACE_LSOCK_Acceptor::accept (ACE_LSOCK_Stream &new_stream,
+ACE_LSOCK_Acceptor::accept (ACE_LSOCK_Stream &new_local_ipc_sap, 
 			    ACE_Addr *remote_addr, 
 			    ACE_Time_Value *timeout,
 			    int restart,
                             int reset_new_handle) const
 {
   ACE_TRACE ("ACE_LSOCK_Acceptor::accept");
-
-  int in_blocking_mode = 0;
-  if (this->shared_accept_start (timeout,
-				 restart,
-				 in_blocking_mode) == -1)
-    return -1;
-  else
-    {
-      sockaddr *addr = 0;
-      int len = 0;
-
-      if (remote_addr != 0)
-	{
-	  len = remote_addr->get_size ();
-	  addr = (sockaddr *) remote_addr->get_addr ();
-	}
-
-      do
-	new_stream.set_handle (ACE_OS::accept (this->get_handle (),
-					       addr,
-					       &len));
-      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 
-	  && remote_addr != 0)
-	remote_addr->set_size (len);
-    }
-
-  return this->shared_accept_finish (new_stream,
-				     in_blocking_mode,
-				     reset_new_handle);
+  ACE_HANDLE new_handle = 
+    ACE_SOCK_Acceptor::shared_accept (remote_addr, timeout, restart, reset_new_handle);
+  new_local_ipc_sap.set_handle (new_handle);
+  return new_handle == ACE_INVALID_HANDLE ? -1 : 0;
 }
 
 // Close down the UNIX domain stream and remove the rendezvous point
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index a5c1260f0b8..a6e359ef34b 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -1299,9 +1299,12 @@ ACE_Token_Proxy::handle_options (ACE_Synch_Options &options,
   if (options[ACE_Synch_Options::USE_REACTOR] == 1)
     // Asynchronous.
     {
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
+      int error = errno;
+      // if (options[ACE_Synch_Options::USE_TIMEOUT] == 1)
+      // ACE_ERROR_RETURN ((LM_ERROR, "Timeouts not yet supported" "
+      // with asynchronous operations."), -1);
       cv.mutex ().release ();
+      errno = error;
       ACE_RETURN (-1);
     }
   else
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 7114ce06675..06d3aeb191f 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -123,9 +123,9 @@ ACE_Log_Msg_Manager::close (void)
 }
 
 /* static */
-#if defined (ACE_HAS_THR_C_DEST)
+#if defined (ACE_HAS_THR_C_FUNC)
 extern "C"
-#endif /* ACE_HAS_THR_C_DEST */
+#endif /* ACE_HAS_THR_C_FUNC */
 void
 ACE_TSS_cleanup (void *ptr)
 {
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 67e76992def..f1255f597a6 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -492,10 +492,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::wait_not_full_cond (ACE_Guard<ACE_SYNCH_MUTEX_
         result = this->not_full_cond_.acquire ();
       else
         result = this->not_full_cond_.acquire (*timeout);
-
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
+      int error = errno;
       mon.acquire ();
+      errno = error;
     }
 #else
   ACE_UNUSED_ARG (mon);
@@ -541,9 +540,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::wait_not_empty_cond (ACE_Guard<ACE_SYNCH_MUTEX
           if (result == -1 && errno == ETIME)
             errno = EWOULDBLOCK;
         }
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
+      int error = errno;
       mon.acquire ();
+      errno = error;
     }
 #else
   ACE_UNUSED_ARG (mon);
diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h
index 90484d98a28..95ece558c3a 100644
--- a/ace/Message_Queue_T.h
+++ b/ace/Message_Queue_T.h
@@ -213,9 +213,6 @@ public:
   virtual ACE_Notification_Strategy *notification_strategy (void);
   virtual void notification_strategy (ACE_Notification_Strategy *s);
 
-  ACE_SYNCH_MUTEX_T &lock (void);
-  // Returns a reference to the lock used by the <ACE_Message_Queue>.
-
   virtual void dump (void) const;
   // Dump the state of an object.
 
@@ -224,7 +221,6 @@ public:
 
 protected:
   // = Routines that actually do the enqueueing and dequeueing.
-
   // These routines assume that locks are held by the corresponding
   // public methods.  Since they are virtual, you can change the
   // queueing mechanism by subclassing from <ACE_Message_Queue>.
@@ -243,25 +239,18 @@ protected:
   // queue.
 
   // = Check the boundary conditions (assumes locks are held).
-
   virtual int is_full_i (void);
   // True if queue is full, else false.
-
   virtual int is_empty_i (void);
   // True if queue is empty, else false.
 
-  // = Implementation of the public <activate> and <deactivate> methods.
-
-  // These methods assume locks are held.
-
+  // = Implementation of the public activate() and deactivate() methods above (assumes locks are held).
   virtual int deactivate_i (void);
   // Deactivate the queue.
-
   virtual int activate_i (void);
   // Activate the queue.
 
   // = Helper methods to factor out common #ifdef code.
-
   virtual int wait_not_full_cond (ACE_Guard<ACE_SYNCH_MUTEX_T> &mon,
                                   ACE_Time_Value *timeout);
   // Wait for the queue to become non-full.
diff --git a/ace/Message_Queue_T.i b/ace/Message_Queue_T.i
index b5ddf46a60f..c0517a71f47 100644
--- a/ace/Message_Queue_T.i
+++ b/ace/Message_Queue_T.i
@@ -149,10 +149,4 @@ ACE_Message_Queue<ACE_SYNCH_USE>::deactivated (void)
   return this->deactivated_;
 }
 
-template <ACE_SYNCH_DECL> ACE_INLINE ACE_SYNCH_MUTEX_T &
-ACE_Message_Queue<ACE_SYNCH_USE>::lock (void) 
-{
-  return this->lock_;
-}
-
 ACE_ALLOC_HOOK_DEFINE(ACE_Message_Queue_Reverse_Iterator)
diff --git a/ace/OS.cpp b/ace/OS.cpp
index b5fef535e14..425bcad3dbf 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -5244,12 +5244,12 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
 
   if (result == -1)
     {
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
+      int error = errno;
       ACE_OS::mutex_destroy (&rw->lock_);
       ACE_OS::cond_destroy (&rw->waiting_readers_);
       ACE_OS::cond_destroy (&rw->waiting_writers_);
       ACE_OS::cond_destroy (&rw->waiting_important_writer_);
+      errno = error;
     }
   return result;
 #   else
@@ -5498,7 +5498,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
   ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
 
   int result = 0;
-  ACE_Errno_Guard error (errno, 0);
+  int error = 0;
   int msec_timeout;
 
   if (timeout->sec () == 0 && timeout->usec () == 0)
@@ -5648,6 +5648,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
   // occur because that's the guarantee that we give to our callers.
   ACE_OS::mutex_lock (external_mutex);
 
+  errno = error;
   return result;
 #   endif /* ACE_HAS_WTHREADS || ACE_HAS_VXWORKS || ACE_PSOS */
 # else
diff --git a/ace/OS.h b/ace/OS.h
index c51c26fb67e..b4133fa650c 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -296,12 +296,6 @@
 #   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
-
 // Default shared memory key
 # if !defined (ACE_DEFAULT_SHM_KEY)
 #   define ACE_DEFAULT_SHM_KEY 1234
@@ -1114,7 +1108,6 @@ private:
 // This needs to go here *first* to avoid problems with AIX.
 # if defined (ACE_HAS_PTHREADS)
 extern "C" {
-#   include /**/ <signal.h>
 #   include /**/ <pthread.h>
 #   if defined (DIGITAL_UNIX)
 #     define pthread_self __pthread_self
@@ -2018,31 +2011,19 @@ typedef pthread_mutex_t ACE_thread_mutex_t;
 
 #     if defined (ACE_HAS_PTHREADS_DRAFT4)
 #       if defined (PTHREAD_PROCESS_PRIVATE)
-#         if !defined (USYNC_THREAD)
 #         define USYNC_THREAD    PTHREAD_PROCESS_PRIVATE
-#         endif /* ! USYNC_THREAD */
 #       else
-#         if !defined (USYNC_THREAD)
 #         define USYNC_THREAD    MUTEX_NONRECURSIVE_NP
-#         endif /* ! USYNC_THREAD */
 #       endif /* PTHREAD_PROCESS_PRIVATE */
 
 #       if defined (PTHREAD_PROCESS_SHARED)
-#         if !defined (USYNC_PROCESS)
 #         define USYNC_PROCESS   PTHREAD_PROCESS_SHARED
-#         endif /* ! USYNC_PROCESS */
 #       else
-#         if !defined (USYNC_PROCESS)
 #         define USYNC_PROCESS   MUTEX_NONRECURSIVE_NP
-#         endif /* ! USYNC_PROCESS */
 #       endif /* PTHREAD_PROCESS_SHARED */
 #     elif !defined (ACE_HAS_STHREADS)
-#       if !defined (USYNC_THREAD)
 #       define USYNC_THREAD PTHREAD_PROCESS_PRIVATE
-#       endif /* ! USYNC_THREAD */
-#       if !defined (USYNC_PROCESS)
 #       define USYNC_PROCESS PTHREAD_PROCESS_SHARED
-#       endif /* ! USYNC_PROCESS */
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 */
 
 #     define THR_BOUND               0x00000001
@@ -2091,8 +2072,14 @@ protected:
 #       endif /* !ACE_HAS_POSIX_SEM */
 
 #       if defined (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD)
-        // If we are on Solaris we can just reuse the existing
-        // implementations of these synchronization types.
+#         if defined (USYNC_THREAD)
+#           undef USYNC_THREAD
+#         endif /* USYNC_THREAD */
+#         if defined (USYNC_PROCESS)
+#           undef USYNC_PROCESS
+#         endif /* USYNC_PROCESS */
+// If we are on Solaris we can just reuse the existing implementations
+// of these synchronization types.
 #         if !defined (ACE_LACKS_RWLOCK_T)
 #           include /**/ <synch.h>
 typedef rwlock_t ACE_rwlock_t;
@@ -2318,11 +2305,11 @@ public:
 #     define THR_CANCEL_ENABLE       0
 #     define THR_CANCEL_DEFERRED     0
 #     define THR_CANCEL_ASYNCHRONOUS 0
-#     define THR_DETACHED            0x02000000 /* ignore in most places */
-#     define THR_BOUND               0          /* ignore in most places */
-#     define THR_NEW_LWP             0          /* ignore in most places */
-#     define THR_DAEMON              0          /* ignore in most places */
-#     define THR_JOINABLE            0          /* ignore in most places */
+#     define THR_DETACHED    0x02000000 /* ?? ignore in most places */
+#     define THR_BOUND       0          /* ?? ignore in most places */
+#     define THR_NEW_LWP     0          /* ?? ignore in most places */
+#     define THR_DAEMON      0          /* ?? ignore in most places */
+#     define THR_JOINABLE    0          /* ?? ignore in most places */
 #     define THR_SUSPENDED   CREATE_SUSPENDED
 #     define THR_USE_AFX             0x01000000
 #     define THR_SCHED_FIFO          0
@@ -3126,8 +3113,6 @@ struct iovec
 {
   size_t iov_len; // byte count to read/write
   char *iov_base; // data to be read/written
-
-  operator WSABUF &(void) { return *((WSABUF *) this); }
 };
 
 struct msghdr
@@ -3483,16 +3468,9 @@ typedef void (*__sighandler_t)(int); // keep Signal compilation happy
 #     include /**/ <sys/time.h>
 #     include /**/ <sys/wait.h>
 #     include /**/ <pwd.h>
-      // sets O_NDELAY
-#     include /**/ <unix.h>
-#     include /**/ <sys/param.h> /* for NBBY */
-      typedef long fd_mask;
-#     if !defined (NFDBITS)
-#       define NFDBITS (sizeof(fd_mask) * NBBY)        /* bits per mask */
-#     endif /* ! NFDBITS */
-#     if !defined (howmany)
+#     ifndef howmany
 #       define howmany(x, y)   (((x)+((y)-1))/(y))
-#     endif /* ! howmany */
+#     endif /* howmany */
 #   elif ! defined (VXWORKS)
 #     include /**/ <sys/uio.h>
 #     include /**/ <sys/ipc.h>
@@ -4165,9 +4143,7 @@ union semun
 // Max size of an ACE Token client ID.
 # define ACE_MAXCLIENTIDLEN MAXHOSTNAMELEN + 20
 
-//
 // Create some useful typedefs.
-//
 typedef const char **SYS_SIGLIST;
 typedef void *(*ACE_THR_FUNC)(void *);
 // This is for C++ static methods.
@@ -4231,12 +4207,6 @@ struct ACE_Export siginfo_t
 };
 # endif /* ACE_HAS_SIGINFO_T */
 
-// Typedef for the null handler func.
-extern "C"
-{
-  typedef void (*ACE_SIGNAL_C_FUNC)(int,siginfo_t*,void*);
-}
-
 # if !defined (ACE_HAS_UCONTEXT_T)
 typedef int ucontext_t;
 # endif /* ACE_HAS_UCONTEXT_T */
@@ -4709,251 +4679,6 @@ extern "C" {
   typedef int (*ACE_COMPARE_FUNC)(const void *, const void *);
 }
 
-class ACE_Export ACE_Errno_Guard
-{
-  // = TITLE
-  //   Provides a wrapper to improve performance when thread-specific
-  //   errno must be saved and restored in a block of code.
-  //
-  // = DESCRIPTION
-  //   The typical use-case for this is the following:
-  //
-  //   int error = errno;
-  //   call_some_function_that_might_change_errno ();
-  //   errno = error;
-  //
-  //   This can be replaced with
-  //
-  //   {
-  //     ACE_Errno_Guard guard (errno);
-  //     call_some_function_that_might_change_errno ();
-  //   }
-  //
-  //   This implementation is more elegant and more efficient since it
-  //   avoids an unnecessary second access to thread-specific storage
-  //   by caching a pointer to the value of errno in TSS.
-public:
-  // = Initialization and termination methods.
-  ACE_Errno_Guard (int &errno_ref,
-		   int error);
-  //  Stash the value of <error> into <error_> and initialize the
-  //  <errno_ptr_> to the address of <errno_ref>.
-
-  ACE_Errno_Guard (int &errno_ref);
-  //  Stash the value of <errno> into <error_> and initialize the
-  //  <errno_ptr_> to the address of <errno_ref>.
-
-  ~ACE_Errno_Guard (void);
-  // Reset the value of <errno> to <error>.
-
-  int operator= (int error);
-  // Assign <error> to <error_>.
-
-  int operator== (int error);
-  // Compare <error> with <error_> for equality.
-
-  int operator!= (int error);
-  // Compare <error> with <error_> for inequality.
-
-private:
-#if defined (ACE_MT_SAFE)
-  int *errno_ptr_;
-#endif /* ACE_MT_SAFE */
-  int error_;
-};
-
-#if defined (ACE_HAS_WINSOCK2)
-typedef SERVICETYPE ACE_SERVICE_TYPE;
-typedef GROUP ACE_SOCK_GROUP;
-typedef WSAPROTOCOL_INFO ACE_Protocol_Info;
-#else
-typedef u_long ACE_SOCK_GROUP;
-typedef u_long ACE_SERVICE_TYPE;
-typedef u_long ACE_Protocol_Info;
-#endif /* SERVICETYPE */
-
-class ACE_Export ACE_Flow_Spec
-#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 RSVP.
-public:
-  // = Get/set the token rate in bytes/sec.
-  u_long token_rate (void);
-  void token_rate (u_long tr);
-
-  // = Get/set the token bucket size in bytes.
-  u_long token_bucket_size (void);
-  void token_bucket_size (u_long tbs);
-
-  // = Get/set the PeakBandwidth in bytes/sec.
-  u_long peak_bandwidth (void);
-  void peak_bandwidth (u_long pb);
-
-  // = Get/set the latency in microseconds.
-  u_long latency (void);
-  void latency (u_long l);
-
-  // = Get/set the delay variation in microseconds.
-  u_long delay_variation (void);
-  void delay_variation (u_long dv);
-
-  // = Get/set the service type.
-  ACE_SERVICE_TYPE service_type (void);
-  void service_type (ACE_SERVICE_TYPE st);
-
-  // = Get/set the maximum SDU size in bytes.
-  u_long max_sdu_size (void);
-  void max_sdu_size (u_long mss);
-
-  // = Get/set the minimum policed size in bytes.
-  u_long minimum_policed_size (void);
-  void minimum_policed_size (u_long mps);
-};
-
-class ACE_Export ACE_QoS
-#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 RSVP.
-public:
-  // = Get/set the flow spec for data sending.
-  ACE_Flow_Spec sending_flowspec (void);
-  void sending_flowspec (const ACE_Flow_Spec &fs);
-
-  // = Get/set the flow spec for data receiving.
-  ACE_Flow_Spec receiving_flowspec (void);
-  void receiving_flowspec (const ACE_Flow_Spec &fs);
-
-  // = Get/set the provider specific information.
-  iovec provider_specific (void);
-  void provider_specific (const iovec &ps);
-};
-
-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_Connect_QoS_Params (iovec *caller_data = 0,
-			  iovec *callee_data = 0,
-			  ACE_QoS *socket_qos = 0,
-			  ACE_QoS *group_socket_qos = 0,
-			  u_long flags = 0);
-  // Initialize the data members.  The <caller_data> is a pointer to
-  // the user data that is to be transferred to the peer during
-  // connection establishment.  The <callee_data> is a pointer to the
-  // user data that is to be transferred back from the peer during
-  // connection establishment.  The_<socket_qos> is a pointer to the
-  // flow speicfications for the socket, one for each direction.  The
-  // <group_socket_qos> is a pointer to the flow speicfications for
-  // the socket group, if applicable.  The_<flags> indicate if we're a
-  // sender, receiver, or both.
-
-  // = Get/set caller data.
-  iovec *caller_data (void) const;
-  void caller_data (iovec *);
-
-  // = Get/set callee data.
-  iovec *callee_data (void) const;
-  void callee_data (iovec *);
-
-  // = Get/set socket qos.
-  ACE_QoS *socket_qos (void) const;
-  void socket_qos (ACE_QoS *);
-
-  // = Get/set group socket qos.
-  ACE_QoS *group_socket_qos (void) const;
-  void group_socket_qos (ACE_QoS *);
-
-  // = Get/set flags.
-  u_long flags (void) const;
-  void flags (u_long);
-
-private:
-  iovec *caller_data_;
-  // A pointer to the user data that is to be transferred to the peer
-  // during connection establishment.
-
-  iovec *callee_data_;
-  // A pointer to the user data that is to be transferred back from
-  // the peer during connection establishment.
-
-  ACE_QoS *socket_qos_;
-  // A pointer to the flow speicfications for the socket, one for each
-  // direction.
-
-  ACE_QoS *group_socket_qos_;
-  // A pointer to the flow speicfications for the socket group, if
-  // applicable.
-
-  u_long flags_;
-  // Flags that indicate if we're a sender, receiver, or both.
-};
-
-// Callback function that's used by the QoS-enabled <ACE_OS::accept>
-// method.
-typedef int (*ACE_QOS_CONDITION_FUNC) (iovec *caller_id,
-				       iovec *caller_data,
-				       ACE_QoS *socket_qos,
-				       ACE_QoS *group_socket_qos,
-				       iovec *callee_id,
-				       iovec *callee_data,
-				       ACE_SOCK_GROUP *g,
-				       u_long callbackdata);
-
-// Callback function that's used by the QoS-enabled <ACE_OS::ioctl>
-// method.
-typedef void (*ACE_OVERLAPPED_COMPLETION_FUNC) (u_long error,
-						u_long bytes_transferred,
-						ACE_OVERLAPPED *overlapped,
-						u_long flags);
-class ACE_Export ACE_Accept_QoS_Params
-{
-  // = TITLE
-  //   Wrapper class that simplifies the information passed to the QoS
-  //   enabled <ACE_OS::accept> method.
-public:
-  ACE_Accept_QoS_Params (ACE_QOS_CONDITION_FUNC qos_condition_callback = 0,
-			 u_long callback_data = 0);
-  // Initialize the data members.  The <qos_condition_callback> is the
-  // address of an optional, application-supplied condition function
-  // that will make an accept/reject decision based on the caller
-  // information pass in as parameters, and optionally create or join
-  // a socket group by assinging an appropriate value to the result
-  // parameter <g> of this function.  The <callback_data> data is
-  // passed back to the application as a condition function parameter,
-  // i.e., it is an Asynchronous Completion Token (ACT).
-
-  // = Get/set QoS condition callback.
-  ACE_QOS_CONDITION_FUNC qos_condition_callback (void) const;
-  void qos_condition_callback (ACE_QOS_CONDITION_FUNC qcc);
-
-  // = Get/Set callback data.
-  u_long callback_data (void) const;
-  void callback_data (u_long cd);
-
-private:
-  ACE_QOS_CONDITION_FUNC qos_condition_callback_;
-  // This is the address of an optional, application-supplied
-  // condition function that will make an accept/reject decision based
-  // on the caller information pass in as parameters, and optionally
-  // create or join a socket group by assinging an appropriate value
-  // to the result parameter <g> of this function.
-
-  u_long callback_data_;
-  // This data is passed back to the application as a condition
-  // function parameter, i.e., it is an Asynchronous Completion Token
-  // (ACT).
-};
-
 class ACE_Export ACE_OS
 {
   // = TITLE
@@ -5338,9 +5063,9 @@ public:
   static int memcmp (const void *t,
                      const void *s,
                      size_t len);
-  static const void *memchr (const void *s,
-                             int c,
-                             size_t len);
+  static void *memchr(const void *s,
+                      int c,
+                      size_t len);
   static void *memcpy (void *t,
                        const void *s,
                        size_t len);
@@ -5465,17 +5190,6 @@ public:
   static int ioctl (ACE_HANDLE handle,
                     int cmd,
                     void * = 0);
-  // UNIX-style <ioctl>.
-  static int ioctl (ACE_HANDLE socket,
-		    u_long io_control_code,
-		    void *in_buffer_p,
-		    u_long in_buffer,
-		    void *out_buffer_p,
-		    u_long out_buffer,
-		    u_long *bytes_returned,
-		    ACE_OVERLAPPED *overlapped,
-		    ACE_OVERLAPPED_COMPLETION_FUNC func);
-  // QoS-enabled <ioctl>.
   static int isastream (ACE_HANDLE handle);
   static int isatty (ACE_HANDLE handle);
   static off_t lseek (ACE_HANDLE handle,
@@ -5704,29 +5418,12 @@ public:
   static ACE_HANDLE accept (ACE_HANDLE handle,
                             struct sockaddr *addr,
                             int *addrlen);
-  // BSD-style <accept> (no QoS).
-  static ACE_HANDLE accept (ACE_HANDLE handle,
-                            struct sockaddr *addr,
-                            int *addrlen,
-			    const ACE_Accept_QoS_Params &qos_params);
-  // QoS-enabled <accept>, which passes <qos_params> to <accept>.  If
-  // the OS platform doesn't support QoS-enabled <accept> then the
-  // <qos_params> are ignored and the BSD-style <accept> is called.
   static int bind (ACE_HANDLE s,
                    struct sockaddr *name,
                    int namelen);
   static int connect (ACE_HANDLE handle,
                       struct sockaddr *addr,
                       int addrlen);
-  // BSD-style <connect> (no QoS).
-  static int connect (ACE_HANDLE handle,
-                      const sockaddr *addr,
-                      int addrlen,
-		      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.
-
   static int closesocket (ACE_HANDLE s);
   static struct hostent *gethostbyaddr (const char *addr,
                                         int length,
@@ -5772,6 +5469,7 @@ public:
   static char *inet_ntoa (const struct in_addr addr);
   static int inet_aton (const char *strptr,
                         struct in_addr *addr);
+
   static const char *inet_ntop (int family,
                                 const void *addrptr,
                                 char *strptr,
@@ -5779,11 +5477,8 @@ public:
   static int inet_pton (int family,
                         const char *strptr,
                         void *addrptr);
-  static ACE_HANDLE join_leaf (ACE_HANDLE socket,
-			       const sockaddr *name,
-			       int namelen,
-			       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);
   static int recv (ACE_HANDLE handle,
@@ -5814,22 +5509,11 @@ public:
                          int optname,
                          const char *optval,
                          int optlen);
-  // QoS-enabled <ioctl> wrapper.
   static int shutdown (ACE_HANDLE handle,
                        int how);
   static ACE_HANDLE socket (int domain,
                             int type,
                             int proto);
-  // Create a BSD-style socket (no QoS).
-  static ACE_HANDLE socket (int domain,
-                            int type,
-                            int proto,
-			    ACE_Protocol_Info *protocolinfo,
-			    ACE_SOCK_GROUP g,
-			    u_long flags);
-  // Create a QoS-enabled socket.  If the OS platform doesn't support
-  // QoS-enabled <socket> then the BSD-style <socket> is called.
-
   static int socketpair (int domain,
                          int type,
                          int protocol,
@@ -7277,18 +6961,6 @@ ACE_MAIN (int argc, ASYS_TCHAR *argv[]) /* user's entry point, e.g., main */ \
 } \
 int \
 ace_main_i
-#     if defined (ACE_WIN32) && defined (UNICODE)
-#     define wmain \
-ace_main_i (int, ASYS_TCHAR *[]);                  /* forward declaration */ \
-int \
-wmain (int argc, ASYS_TCHAR *argv[]) /* user's entry point, e.g., main */ \
-{ \
-  ACE_MAIN_OBJECT_MANAGER \
-  return ace_main_i (argc, argv);           /* what the user calls "main" */ \
-} \
-int \
-ace_main_i
-#     endif /* ACE_WIN32 && UNICODE */
 #   endif   /* ACE_PSOSIM */
 # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
diff --git a/ace/OS.i b/ace/OS.i
index 9f468e149c8..5bd1756d4c3 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -107,55 +107,6 @@ typedef const struct timespec * ACE_TIMESPEC_PTR;
 # include /**/ <malloc.h>
 #endif /* ACE_LACKS_MALLOC_H */
 
-ACE_INLINE
-ACE_Errno_Guard::ACE_Errno_Guard (int &errno_ref,
-				  int error)
-  :
-#if defined (ACE_MT_SAFE)
-    errno_ptr_ (&errno_ref),
-#endif /* ACE_MT_SAFE */
-    error_ (error) 
-{
-}
-
-ACE_INLINE
-ACE_Errno_Guard::ACE_Errno_Guard (int &errno_ref)
-  :
-#if defined (ACE_MT_SAFE)
-    errno_ptr_ (&errno_ref),
-#endif /* ACE_MT_SAFE */
-    error_ (errno_ref) 
-{ 
-}
-
-ACE_INLINE 
-ACE_Errno_Guard::~ACE_Errno_Guard (void)
-{
-#if defined (ACE_MT_SAFE)
-  *errno_ptr_ = this->error_;
-#else
-  errno = this->error_;
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_INLINE int 
-ACE_Errno_Guard::operator= (int error)
-{
-  return this->error_ = error;
-}
-
-ACE_INLINE int 
-ACE_Errno_Guard::operator== (int error)
-{
-  return this->error_ == error;
-}
-
-ACE_INLINE int 
-ACE_Errno_Guard::operator!= (int error)
-{
-  return this->error_ != error;
-}
-
 // Returns the value of the object as a timeval.
 
 ACE_INLINE
@@ -746,6 +697,8 @@ ACE_OS::umask (mode_t cmask)
 
 #else /* ACE_WIN32 */
 
+// This is for Win32 exclusively!
+
 // Adapt the Win32 System Calls (which return BOOLEAN values of TRUE
 // and FALSE) into int values expected by the ACE_OSCALL macros.
 # define ACE_ADAPT_RETVAL(OP,RESULT) ((RESULT = (OP)) == FALSE ? -1 : 0)
@@ -1243,22 +1196,22 @@ ACE_OS::memcmp (const void *t, const void *s, size_t len)
   return ::memcmp (t, s, len);
 }
 
-ACE_INLINE const void *
+ACE_INLINE void *
 ACE_OS::memchr (const void *s, int c, size_t len)
 {
 #if defined (ACE_HAS_MEMCHR)
   ACE_TRACE ("ACE_OS::memchr");
   return ::memchr (s, c, len);
 #else
-  u_char *t = (u_char *) s;
-  u_char *e = (u_char *) s + len;
-
+  unsigned char *t = (unsigned char *) s;
+  unsigned char *e = (unsigned char *) s + len;
   while (t < e)
-    if (((int) *t) == c)
-      return t;
-    else
-      t++;
-
+    {
+      if (((int) *t) == c)
+        return t;
+      else
+        t++;
+    }
   return 0;
 #endif /* ACE_HAS_MEMCHR */
 }
@@ -2635,11 +2588,9 @@ ACE_OS::recursive_mutex_lock (ACE_recursive_thread_mutex_t *m)
       m->nesting_level_++;
     }
 
-  {
-    // Save/restore errno.
-    ACE_Errno_Guard error (errno);
-    ACE_OS::thread_mutex_unlock (&m->nesting_mutex_);
-  }
+  int error = errno;
+  ACE_OS::thread_mutex_unlock (&m->nesting_mutex_);
+  errno = error;
   return result;
 #endif /* ACE_HAS_RECURSIVE_MUTEXES */
 #else
@@ -2680,11 +2631,9 @@ ACE_OS::recursive_mutex_trylock (ACE_recursive_thread_mutex_t *m)
         }
     }
 
-  {
-    // Save/restore errno.
-    ACE_Errno_Guard error (errno);
-    ACE_OS::thread_mutex_unlock (&m->nesting_mutex_);
-  }
+  int error = errno;
+  ACE_OS::thread_mutex_unlock (&m->nesting_mutex_);
+  errno = error;
   return result;
 #endif /* ACE_HAS_RECURSIVE_MUTEXES */
 #else
@@ -2733,12 +2682,9 @@ ACE_TRACE ("ACE_Recursive_Thread_Mutex::release");
             }
         }
     }
-
-  {
-    // Save/restore errno.
-    ACE_Errno_Guard error (errno);
-    ACE_OS::thread_mutex_unlock (&m->nesting_mutex_);
-  }
+  int error = errno;
+  ACE_OS::thread_mutex_unlock (&m->nesting_mutex_);
+  errno = error;
   return result;
 #endif /* ACE_HAS_RECURSIVE_MUTEXES */
 #else
@@ -3675,16 +3621,16 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw)
 
 
   int result = 0;
-  ACE_Errno_Guard error (errno, 0);
+  int error = 0;
 
   if (rw->important_writer_ && rw->ref_count_ == 1)
-    // only the reader requesting to upgrade its lock is left over.
+    // only the reader requesting to upgrade its lock is left over
     {
       result = ACE_OS::cond_signal (&rw->waiting_important_writer_);
       error = errno;
     }
   else if (rw->num_waiting_writers_ > 0 && rw->ref_count_ == 0)
-    // give preference to writers over readers...
+    // Give preference to writers over readers...
     {
       result = ACE_OS::cond_signal (&rw->waiting_writers_);
       error = errno;
@@ -3695,13 +3641,15 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw)
       error = errno;
     }
 
+
   ACE_OS::mutex_unlock (&rw->lock_);
+  errno = error;
   return result;
-# endif /* ! ace_lacks_rwlock_t */
+# endif /* ! ACE_LACKS_RWLOCK_T */
 #else
-  ace_unused_arg (rw);
-  ace_notsup_return (-1);
-#endif /* ace_has_threads */
+  ACE_UNUSED_ARG (rw);
+  ACE_NOTSUP_RETURN (-1);
+#endif /* ACE_HAS_THREADS */
 }
 
 // Note that the caller of this method *must* already possess this
@@ -4188,465 +4136,48 @@ ACE_OS::event_reset (ACE_event_t *event)
 # endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 #endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
 
-ACE_INLINE u_long 
-ACE_Flow_Spec::token_rate (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  return this->TokenRate; 
-#else
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_Flow_Spec::token_rate (u_long tr) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  this->TokenRate = tr; 
-#else
-  ACE_UNUSED_ARG (tr);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE u_long 
-ACE_Flow_Spec::token_bucket_size (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  return this->TokenBucketSize; 
-#else
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_Flow_Spec::token_bucket_size (u_long tbs) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  this->TokenBucketSize = tbs; 
-#else
-  ACE_UNUSED_ARG (tbs);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-  
-ACE_INLINE u_long 
-ACE_Flow_Spec::peak_bandwidth (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  return this->PeakBandwidth; 
-#else
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_Flow_Spec::peak_bandwidth (u_long pb) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  this->PeakBandwidth = pb; 
-#else
-  ACE_UNUSED_ARG (pb);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE u_long 
-ACE_Flow_Spec::latency (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  return this->Latency; 
-#else
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_Flow_Spec::latency (u_long l) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  this->Latency = l; 
-#else
-  ACE_UNUSED_ARG (l);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE u_long 
-ACE_Flow_Spec::delay_variation (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  return this->DelayVariation; 
-#else
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-ACE_INLINE void 
-ACE_Flow_Spec::delay_variation (u_long dv) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  this->DelayVariation = dv; 
-#else
-  ACE_UNUSED_ARG (dv);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE ACE_SERVICE_TYPE 
-ACE_Flow_Spec::service_type (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5)
-  return this->ServiceType; 
-#else
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_Flow_Spec::service_type (ACE_SERVICE_TYPE st) 
-{ 
-#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5)
-  this->ServiceType = st; 
-#else
-  ACE_UNUSED_ARG (st);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE u_long 
-ACE_Flow_Spec::max_sdu_size (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5)
-  return this->MaxSduSize; 
-#else
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_Flow_Spec::max_sdu_size (u_long mss) 
-{ 
-#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5)
-  this->MaxSduSize = mss; 
-#else
-  ACE_UNUSED_ARG (mss);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE u_long 
-ACE_Flow_Spec::minimum_policed_size (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5)
-  return this->MinimumPolicedSize; 
-#else
-  ACE_NOTSUP_RETURN (0);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_Flow_Spec::minimum_policed_size (u_long mps) 
-{ 
-#if defined (ACE_HAS_WINSOCK2) && defined (ACE_HAS_WINNT5)
-  this->MinimumPolicedSize = mps; 
-#else
-  ACE_UNUSED_ARG (mps);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE ACE_Flow_Spec
-ACE_QoS::sending_flowspec (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  return (ACE_Flow_Spec &) this->SendingFlowspec; 
-#else
-  ACE_NOTSUP_RETURN (ACE_Flow_Spec ());
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_QoS::sending_flowspec (const ACE_Flow_Spec &fs) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  this->SendingFlowspec = (FLOWSPEC) fs; 
-#else
-  ACE_UNUSED_ARG (fs);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE ACE_Flow_Spec
-ACE_QoS::receiving_flowspec (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  return (ACE_Flow_Spec &) this->ReceivingFlowspec; 
-#else
-  ACE_NOTSUP_RETURN (ACE_Flow_Spec ());
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_QoS::receiving_flowspec (const ACE_Flow_Spec &fs) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  this->ReceivingFlowspec = (FLOWSPEC) fs; 
-#else
-  ACE_UNUSED_ARG (fs);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE iovec 
-ACE_QoS::provider_specific (void) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  return (iovec &) this->ProviderSpecific; 
-#else
-  ACE_NOTSUP_RETURN (iovec ());
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE void 
-ACE_QoS::provider_specific (const iovec &ps) 
-{ 
-#if defined (ACE_HAS_WINSOCK2)
-  this->ProviderSpecific = (WSABUF) ((iovec &) ps); 
-#else
-  ACE_UNUSED_ARG (ps);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE
-ACE_Connect_QoS_Params::ACE_Connect_QoS_Params (iovec *caller_data,
-						iovec *callee_data,
-						ACE_QoS *socket_qos,
-						ACE_QoS *group_socket_qos,
-						u_long flags)
-  : caller_data_ (caller_data),
-    callee_data_ (callee_data),
-    socket_qos_ (socket_qos),
-    group_socket_qos_ (group_socket_qos),
-    flags_ (flags)
-{
-}
-
-ACE_INLINE iovec *
-ACE_Connect_QoS_Params::caller_data (void) const
-{
-  return this->caller_data_;
-}
-
-ACE_INLINE void 
-ACE_Connect_QoS_Params::caller_data (iovec *cd)
-{
-  this->caller_data_ = cd;
-}
-
-ACE_INLINE iovec *
-ACE_Connect_QoS_Params::callee_data (void) const
-{
-  return this->callee_data_;  
-}
-
-ACE_INLINE void 
-ACE_Connect_QoS_Params::callee_data (iovec *cd)
-{
-  this->callee_data_ = cd;  
-}
-
-ACE_INLINE ACE_QoS *
-ACE_Connect_QoS_Params::socket_qos (void) const
-{
-  return this->socket_qos_;
-}
-
-ACE_INLINE void 
-ACE_Connect_QoS_Params::socket_qos (ACE_QoS *sq)
-{
-  this->socket_qos_ = sq;
-}
-
-ACE_INLINE ACE_QoS *
-ACE_Connect_QoS_Params::group_socket_qos (void) const
-{
-  return this->group_socket_qos_;
-}
-
-ACE_INLINE void 
-ACE_Connect_QoS_Params::group_socket_qos (ACE_QoS *gsq)
-{
-  this->group_socket_qos_ = gsq;
-}
-
-ACE_INLINE u_long 
-ACE_Connect_QoS_Params::flags (void) const
-{
-  return this->flags_;
-}
-
-ACE_INLINE void 
-ACE_Connect_QoS_Params::flags (u_long f)
-{
-  this->flags_ = f;
-}
-
-ACE_INLINE
-ACE_Accept_QoS_Params::ACE_Accept_QoS_Params (ACE_QOS_CONDITION_FUNC qos_condition_callback,
-					      u_long callback_data)
-  : qos_condition_callback_ (qos_condition_callback),
-    callback_data_ (callback_data)
-{
-}
-
-ACE_INLINE ACE_QOS_CONDITION_FUNC
-ACE_Accept_QoS_Params::qos_condition_callback (void) const
-{
-  return this->qos_condition_callback_; 
-}
-
-ACE_INLINE void 
-ACE_Accept_QoS_Params::qos_condition_callback (ACE_QOS_CONDITION_FUNC qcc)
-{
-  this->qos_condition_callback_ = qcc;
-}
-
-ACE_INLINE u_long
-ACE_Accept_QoS_Params::callback_data (void) const
-{
-  return this->callback_data_;
-}
-
-ACE_INLINE void 
-ACE_Accept_QoS_Params::callback_data (u_long cd)
-{
-  this->callback_data_ = cd;
-}
 
 ACE_INLINE ACE_HANDLE
-ACE_OS::accept (ACE_HANDLE handle,
-		struct sockaddr *addr,
+ACE_OS::accept (ACE_HANDLE handle, struct sockaddr *addr,
                 int *addrlen)
 {
   ACE_TRACE ("ACE_OS::accept");
 #if defined (ACE_PSOS)
 #  if !defined (ACE_PSOS_DIAB_PPC)
-  ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle,
-				 (struct sockaddr_in *) addr,
-				 (ACE_SOCKET_LEN *) addrlen),
-		       ACE_HANDLE, 
-		       ACE_INVALID_HANDLE);
+ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
+                                (ACE_SOCKET_LEN *) addrlen),
+                      ACE_HANDLE, ACE_INVALID_HANDLE);
 #  else
-ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle,
-			       (struct sockaddr *) addr,
-			       (ACE_SOCKET_LEN *) addrlen),
-		     ACE_HANDLE,
-		     ACE_INVALID_HANDLE);
+ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, (struct sockaddr *) addr,
+                                (ACE_SOCKET_LEN *) addrlen),
+                      ACE_HANDLE, ACE_INVALID_HANDLE);
 #  endif /* defined ACE_PSOS_DIAB_PPC */
 #else
-  // On a non-blocking socket with no connections to accept, this
-  // system call will return EWOULDBLOCK or EAGAIN, depending on the
-  // platform.  UNIX 98 allows either errno, and they may be the same
-  // numeric value.  So to make life easier for upper ACE layers as
-  // well as application programmers, always change EAGAIN to
-  // EWOULDBLOCK.  Rather than hack the ACE_OSCALL_RETURN macro, it's
-  // handled explicitly here.  If the ACE_OSCALL macro ever changes,
-  // this function needs to be reviewed.  On Win32, the regular macros
-  // can be used, as this is not an issue.
+  // On a non-blocking socket with no connections to accept, this system
+  // call will return EWOULDBLOCK or EAGAIN, depending on the platform.
+  // UNIX 98 allows either errno, and they may be the same numeric value.
+  // So to make life easier for upper ACE layers as well as application
+  // programmers, always change EAGAIN to EWOULDBLOCK.  Rather than hack the
+  // ACE_OSCALL_RETURN macro, it's handled explicitly here.  If the ACE_OSCALL
+  // macro ever changes, this function needs to be reviewed.
+  // On Win32, the regular macros can be used, as this is not an issue.
 
 #  if defined (ACE_WIN32)
-  ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle,
-				 addr,
-				 (ACE_SOCKET_LEN *) addrlen),
-                       ACE_HANDLE,
-		       ACE_INVALID_HANDLE);
+  ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN *) addrlen),
+                       ACE_HANDLE, ACE_INVALID_HANDLE);
 #  else
-  ACE_HANDLE ace_result = ::accept ((ACE_SOCKET) handle,
-				    addr,
-				    (ACE_SOCKET_LEN *) addrlen) ;
-  if (ace_result == ACE_INVALID_HANDLE && errno == EAGAIN)
+
+  ACE_HANDLE ace_result_;
+  ace_result_ = ::accept ((ACE_SOCKET) handle, addr,
+                          (ACE_SOCKET_LEN *) addrlen) ;
+  if (ace_result_ == ACE_INVALID_HANDLE && errno == EAGAIN)
     errno = EWOULDBLOCK;
-  return ace_result;
+  return ace_result_;
 
 #  endif /* defined (ACE_WIN32) */
 #endif /* defined (ACE_PSOS) */
 }
 
-ACE_INLINE ACE_HANDLE
-ACE_OS::accept (ACE_HANDLE handle,
-		struct sockaddr *addr,
-                int *addrlen,
-		const ACE_Accept_QoS_Params &qos_params)
-{
-#if defined (ACE_HAS_WINSOCK2)
-  ACE_SOCKCALL_RETURN (::WSAAccept ((ACE_SOCKET) handle,
-				    addr,
-				    (ACE_SOCKET_LEN *) addrlen,
-				    (LPCONDITIONPROC) qos_params.qos_condition_callback (),
-				    qos_params.callback_data ()),
-                       ACE_HANDLE,
-		       ACE_INVALID_HANDLE);
-#else
-  ACE_UNUSED_ARG (qos_params);
-  return ACE_OS::accept (handle,
-			 addr,
-			 addrlen);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE ACE_HANDLE
-ACE_OS::join_leaf (ACE_HANDLE socket,
-		   const sockaddr *name,
-		   int namelen,
-		   const ACE_Connect_QoS_Params &qos_params)
-{
-#if defined (ACE_HAS_WINSOCK2)
-  ACE_SOCKCALL_RETURN (::WSAJoinLeaf ((ACE_SOCKET) socket,
-				      name,
-				      namelen,
-				      (WSABUF *) qos_params.caller_data (),
-				      (WSABUF *) qos_params.callee_data (),
-				      (QOS *) qos_params.socket_qos (),
-				      (QOS *) qos_params.group_socket_qos (),
-				      qos_params.flags ()),
-                       ACE_HANDLE,
-		       ACE_INVALID_HANDLE);
-#else
-  ACE_UNUSED_ARG (socket);
-  ACE_UNUSED_ARG (name);
-  ACE_UNUSED_ARG (namelen);
-  ACE_UNUSED_ARG (qos_params);
-  ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
-ACE_INLINE int 
-ACE_OS::ioctl (ACE_HANDLE socket,
-	       u_long io_control_code,
-	       void *in_buffer_p,
-	       u_long in_buffer,
-	       void *out_buffer_p,
-	       u_long out_buffer,
-	       u_long *bytes_returned,
-	       ACE_OVERLAPPED *overlapped,
-	       ACE_OVERLAPPED_COMPLETION_FUNC func)
-{
-#if defined (ACE_HAS_WINSOCK2)
-  ACE_SOCKCALL_RETURN (::WSAIoctl ((ACE_SOCKET) socket,
-				   io_control_code,
-				   in_buffer_p,
-				   in_buffer,
-				   out_buffer_p,
-				   out_buffer,
-				   bytes_returned,
-				   (WSAOVERLAPPED *) overlapped,
-				   (LPWSAOVERLAPPED_COMPLETION_ROUTINE) func),
-                       int,
-		       SOCKET_ERROR);
-#else
-  ACE_UNUSED_ARG (socket);
-  ACE_UNUSED_ARG (io_control_code);
-  ACE_UNUSED_ARG (in_buffer_p);
-  ACE_UNUSED_ARG (in_buffer);
-  ACE_UNUSED_ARG (out_buffer_p);
-  ACE_UNUSED_ARG (out_buffer);
-  ACE_UNUSED_ARG (bytes_returned);
-  ACE_UNUSED_ARG (overlapped);
-  ACE_UNUSED_ARG (func);
-  ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
 ACE_INLINE int
 ACE_OS::bind (ACE_HANDLE handle, struct sockaddr *addr, int addrlen)
 {
@@ -4661,9 +4192,7 @@ ACE_OS::bind (ACE_HANDLE handle, struct sockaddr *addr, int addrlen)
 }
 
 ACE_INLINE int
-ACE_OS::connect (ACE_HANDLE handle,
-		 struct sockaddr *addr,
-		 int addrlen)
+ACE_OS::connect (ACE_HANDLE handle, struct sockaddr *addr, int addrlen)
 {
   ACE_TRACE ("ACE_OS::connect");
 #if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
@@ -4675,30 +4204,6 @@ ACE_OS::connect (ACE_HANDLE handle,
 #endif /* defined (ACE_PSOS)  && !defined (ACE_PSOS_DIAB_PPC) */
 }
 
-ACE_INLINE int
-ACE_OS::connect (ACE_HANDLE handle,
-		 const sockaddr *addr,
-		 int addrlen,
-		 const ACE_Connect_QoS_Params &qos_params)
-{
-  ACE_TRACE ("ACE_OS::connect");
-#if defined (ACE_HAS_WINSOCK2)
-  ACE_SOCKCALL_RETURN (::WSAConnect ((ACE_SOCKET) handle,
-				     (const sockaddr *) addr,
-				     (ACE_SOCKET_LEN) addrlen,
-				     (WSABUF *) qos_params.caller_data (),
-				     (WSABUF *) qos_params.callee_data (),
-				     (QOS *) qos_params.socket_qos (),
-				     (QOS *) qos_params.group_socket_qos ()),
-                       int, -1);
-#else  
-  ACE_UNUSED_ARG (qos_params);
-  return ACE_OS::connect (handle,
-			  (sockaddr *) addr,
-			  addrlen);
-#endif /* ACE_HAS_WINSOCK2 */
-}
-
 #if !defined (VXWORKS)
 ACE_INLINE struct hostent *
 ACE_OS::gethostbyname (const char *name)
@@ -5109,46 +4614,11 @@ ACE_OS::shutdown (ACE_HANDLE handle, int how)
 }
 
 ACE_INLINE ACE_HANDLE
-ACE_OS::socket (int domain,
-		int type,
-		int proto)
+ACE_OS::socket (int domain, int type, int proto)
 {
   ACE_TRACE ("ACE_OS::socket");
-  ACE_SOCKCALL_RETURN (::socket (domain,
-				 type,
-				 proto),
-                       ACE_HANDLE,
-		       ACE_INVALID_HANDLE);
-}
-
-ACE_INLINE ACE_HANDLE
-ACE_OS::socket (int domain,
-		int type,
-		int proto,
-		ACE_Protocol_Info *protocolinfo,
-		ACE_SOCK_GROUP g,
-		u_long flags)
-{
-  ACE_TRACE ("ACE_OS::socket");
-
-#if defined (ACE_HAS_WINSOCK2)
-  ACE_SOCKCALL_RETURN (::WSASocket (domain,
-				    type,
-				    proto,
-				    protocolinfo,
-				    g,
-				    flags),
-                       ACE_HANDLE,
-		       ACE_INVALID_HANDLE);
-#else
-  ACE_UNUSED_ARG (protocolinfo);
-  ACE_UNUSED_ARG (g);
-  ACE_UNUSED_ARG (flags);
-
-  return ACE_OS::socket (domain,
-			 type,
-			 proto);
-#endif /* ACE_HAS_WINSOCK2 */
+  ACE_SOCKCALL_RETURN (::socket (domain, type, proto),
+                       ACE_HANDLE, ACE_INVALID_HANDLE);
 }
 
 ACE_INLINE int
@@ -5550,14 +5020,12 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result,
   ACE_UNUSED_ARG (h_errnop);
   ACE_NOTSUP_RETURN (0);
 # elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE)
-#   if defined (DIGITAL_UNIX) || \
-       (defined (ACE_AIX_MINOR_VERS) && (ACE_AIX_MINOR_VERS > 2))
+#   if defined (DIGITAL_UNIX)
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
   ACE_UNUSED_ARG (h_errnop);
 
-  // gethostbyname returns thread-specific storage on Digital Unix and
-  // AIX 4.3
+  // gethostbyname returns thread-specific storage on Digital Unix
   ACE_SOCKCALL_RETURN (::gethostbyname (name), struct hostent *, 0);
 #   elif defined (AIX) || defined (HPUX_10)
   ::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
@@ -5744,8 +5212,8 @@ ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)
 #if defined (ACE_HAS_IP6)
   ACE_OSCALL_RETURN (::inet_ntop (family, addrptr, strptr, len), const char *, 0);
 #else
-  const u_char *p =
-    ACE_reinterpret_cast (const u_char *, addrptr);
+  const unsigned char *p =
+    ACE_reinterpret_cast (const unsigned char *, addrptr);
 
   if (family == AF_INET)
     {
@@ -6027,14 +5495,17 @@ ACE_OS::thr_getspecific (ACE_OS_thread_key_t key, void **data)
   // of ACE_Log_Msg may not work correctly, so we're keeping this as
   // it is for now.
 
-  ACE_Errno_Guard error (errno);
+  int error = errno;
   *data = ::TlsGetValue (key);
 #   if !defined (ACE_HAS_WINCE)
-  if (*data == 0 && (error = ::GetLastError ()) != NO_ERROR)
+  if (*data == 0 && (errno = ::GetLastError ()) != NO_ERROR)
     return -1;
   else
 #   endif /* ACE_HAS_WINCE */
-    return 0;
+    {
+      errno = error;
+      return 0;
+    }
 # endif /* ACE_HAS_STHREADS */
 #else
   ACE_UNUSED_ARG (key);
@@ -6172,15 +5643,18 @@ ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data)
   // of ACE_Log_Msg may not work correctly, so we're keeping this as
   // it is for now.
 
-  ACE_Errno_Guard error (errno);
+  int error = errno;
   *data = ::TlsGetValue (key);
 #   if !defined (ACE_HAS_WINCE)
-  if (*data == 0 && (error = ::GetLastError ()) != NO_ERROR)
+  if (*data == 0 && (errno = ::GetLastError ()) != NO_ERROR)
 
     return -1;
   else
 #   endif /* ACE_HAS_WINCE */
-    return 0;
+    {
+      errno = error;
+      return 0;
+    }
 # else
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (data);
@@ -7075,7 +6549,7 @@ ACE_OS::t_error (const char *errmsg)
   ACE_TRACE ("ACE_OS::t_error");
 #if defined (ACE_HAS_TLI)
 #if defined (ACE_HAS_BROKEN_T_ERROR)
-  ::t_error (ACE_const_cast (char *, errmsg));
+  ::t_error ((char *) errmsg);
 #else
   ::t_error (errmsg);
 #endif /* ACE_HAS_BROKEN_T_ERROR */
@@ -9379,7 +8853,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
 # if defined (ACE_LACKS_LONGLONG_T)
   ACE_UINT32 least, most;
   ACE_OS::memcpy (&least, &now, sizeof (ACE_UINT32));
-  ACE_OS::memcpy (&most, (u_char *) &now + sizeof (ACE_UINT32),
+  ACE_OS::memcpy (&most, (unsigned char *) &now + sizeof (ACE_UINT32),
                   sizeof (ACE_UINT32));
 
   ACE_hrtime_t ret (least, most);
@@ -11477,5 +10951,3 @@ ACE_OS_CString::wchar_rep (void)
 {
   return this->rep_;
 }
-
-
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
index 9738b4f1c1a..eb89f8fa7ed 100644
--- a/ace/POSIX_Proactor.cpp
+++ b/ace/POSIX_Proactor.cpp
@@ -1022,9 +1022,7 @@ ACE_POSIX_SIG_Proactor::setup_signal_handler (int signal_number) const
   // Lynx says, it is better to set this bit, to be portable.
   reaction.sa_flags &= SA_SIGACTION;
 #endif /* SA_SIGACTION */
-  // Null handler function.
-  reaction.sa_sigaction =
-    ACE_SIGNAL_C_FUNC (&ACE_POSIX_SIG_Proactor::null_handler);
+  reaction.sa_sigaction = null_handler;         // Null handler function.
   int sigaction_return = sigaction (signal_number,
                                     &reaction,
                                     0);
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index d9af1faa1c6..5308a582550 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -359,7 +359,7 @@ public:
                                                        const ACE_Time_Value &tv,
                                                        ACE_HANDLE event = ACE_INVALID_HANDLE,
                                                        int priority = 0,
-                                                       int signal_number = ACE_SIGRTMIN);
+                                                       int signal_number = ACE_SIGRTMIN) ;
   // If <signal_number> is -1, check with the Proactor and use one of
   // the signals that is present in the mask set (i.e. the signals for
   // which the Proactor will be waiting) of the Proactor. If there are
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index e76ccd73e2b..fa25315f78f 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -41,7 +41,7 @@ ACE_Pipe::open (void)
   else
     {
       ACE_INET_Addr sv_addr (my_addr.get_port_number (),
-                             ACE_LOCALHOST);
+                             ASYS_TEXT ("localhost"));
 
       // Establish a connection within the same process.
       if (connector.connect (writer, sv_addr) == -1)
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index d1d3f0ada79..f3581390241 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -265,9 +265,12 @@ ACE_Process_Manager::terminate (pid_t pid)
 
       if (result == -1)
 	{ 
-          // Save/restore errno.
-          ACE_Errno_Guard error (errno);
+	  // We need to save this across calls to remove_thr() since that
+	  // call may reset errno.
+	  int error = errno;
+
 	  this->remove (this->proc_table_[i].proc_id_); 
+	  errno = error; 
 	  return -1; 
 	} 
       else 
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index 7b61793711a..2c54983e515 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -465,12 +465,26 @@ class ACE_RB_Tree_Iterator_Base
 {
   // = TITLE
   //   Implements a common base class for iterators for a Red-Black Tree ADT.
-
 public:
 
+  // = Initialization and termination methods.
+
+  ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree,
+                             int set_first);
+  // Constructor.  Takes an ACE_RB_Tree over which to iterate, and
+  // an integer indicating (if non-zero) to position the iterator
+  // at the first element in the tree (if this integer is 0, the
+  // iterator is positioned at the last element in the tree).
+
+  ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter);
+  // Copy constructor.
+
   void operator= (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter);
   // Assignment operator: copies both the tree reference and the position in the tree.
 
+  ~ACE_RB_Tree_Iterator_Base (void);
+  // Destructor.
+
   // = Iteration methods.
 
   int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const;
@@ -498,22 +512,7 @@ public:
 
 protected:
 
-  // = Initialization and termination methods.
-
-  ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree,
-                             int set_first);
-  // Constructor.  Takes an ACE_RB_Tree over which to iterate, and
-  // an integer indicating (if non-zero) to position the iterator
-  // at the first element in the tree (if this integer is 0, the
-  // iterator is positioned at the last element in the tree).
-
-  ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter);
-  // Copy constructor.
-
-  ~ACE_RB_Tree_Iterator_Base (void);
-  // Destructor.
-
-  // = Internal methods
+  // = protected methods
 
   int forward_i (void);
   // Move forward by one element in the tree.  Returns 0 when
diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp
index 72881602d7d..928a9b98de3 100644
--- a/ace/Remote_Tokens.cpp
+++ b/ace/Remote_Tokens.cpp
@@ -257,10 +257,9 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *))
     {
       if (debug_)
 	{
-          // Save/restore errno.
-          ACE_Errno_Guard error (errno);
-	  ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("shadow try acquire failed\n")));
+	  int error = errno;
+	  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("shadow try acquire failed\n")));
+	  errno = error;
 	}
 
       return -1;
@@ -308,14 +307,11 @@ ACE_Remote_Token_Proxy::renew (int requeue_position,
 
   if (result == -1)
     {
-      {
-        // Save/restore errno.
-        ACE_Errno_Guard error (errno);
-        ACE_Token_Proxy::release ();
-      }
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p error on remote renew, releasing shadow mutex.\n",
-                         "ACE_Remote_Token_Proxy"), -1);
+      int error = errno;
+      ACE_Token_Proxy::release ();
+      errno = error;
+      ACE_ERROR_RETURN ((LM_ERROR, "%p error on remote renew, releasing shadow mutex.\n",
+				   "ACE_Remote_Token_Proxy"), -1);
     }
   else
     {
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index 04c8553631e..f86f37c67b5 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -21,75 +21,6 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (void)
   ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
 }
 
-// Performs the timed accept operation. 
-
-int
-ACE_SOCK_Acceptor::shared_accept_start (ACE_Time_Value *timeout,
-					int restart,
-					int &in_blocking_mode) const
-{
-  ACE_TRACE ("ACE_SOCK_Acceptor::shared_accept_start");
-
-  ACE_HANDLE handle = this->get_handle ();
-
-  // Handle the case where we're doing a timed <accept>.
-  if (timeout != 0)
-    {
-      if (ACE::handle_timed_accept (handle,
-				    timeout,
-				    restart) == -1)
-	return -1;
-      else
-	{
-	  in_blocking_mode = ACE_BIT_DISABLED (ACE::get_flags (handle),
-					       ACE_NONBLOCK);
-	  // Set the handle into non-blocking mode if it's not already
-	  // in it.
-	  if (in_blocking_mode 
-	      && ACE::set_flags (handle,
-				 ACE_NONBLOCK) == -1)
-	    return -1;
-	}
-    }
-
-  return 0;
-}
-
-int
-ACE_SOCK_Acceptor::shared_accept_finish (ACE_SOCK_Stream new_stream,
-					 int in_blocking_mode,
-					 int reset_new_handle) const
-{
-  ACE_TRACE ("ACE_SOCK_Acceptor::shared_accept_finish ()");
-
-  ACE_HANDLE new_handle = new_stream.get_handle ();
-
-  // Check to see if we were originally in blocking mode, and if so,
-  // set the <new_stream>'s handle and <this> handle to be in blocking
-  // mode.
-  if (in_blocking_mode)
-    {
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
-      // Only disable ACE_NONBLOCK if we weren't in
-      // non-blocking mode originally.
-      ACE::clr_flags (this->get_handle (),
-		      ACE_NONBLOCK);
-      ACE::clr_flags (new_handle,
-		      ACE_NONBLOCK);
-    }
-
-#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);      
-#else
-  ACE_UNUSED_ARG (reset_new_handle);
-#endif /* ACE_WIN32 */
-
-  return new_handle == ACE_INVALID_HANDLE ? -1 : 0;
-}
-
 // General purpose routine for accepting new connections. 
 
 int
@@ -101,97 +32,13 @@ ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream,
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::accept");
 
-  int in_blocking_mode = 0;
-  if (this->shared_accept_start (timeout,
-				 restart,
-				 in_blocking_mode) == -1)
-    return -1;
-  else
-    {
-      // On Win32 the third parameter to <accept> must be a NULL
-      // pointer if we want to ignore the client's address.
-      int *len_ptr = 0;
-      sockaddr *addr = 0;
-      int len = 0;
-
-      if (remote_addr != 0)
-	{
-	  len = remote_addr->get_size ();
-          len_ptr = &len;
-	  addr = (sockaddr *) remote_addr->get_addr ();
-	}
-
-      do
-	new_stream.set_handle (ACE_OS::accept (this->get_handle (),
-					       addr,
-					       len_ptr));
-      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 
-	  && remote_addr != 0)
-	remote_addr->set_size (len);
-    }
-
-  return this->shared_accept_finish (new_stream,
-				     in_blocking_mode,
-				     reset_new_handle);
-}
-
-int
-ACE_SOCK_Acceptor::accept (ACE_SOCK_Stream &new_stream, 
-			   ACE_Accept_QoS_Params qos_params,
-                           ACE_Addr *remote_addr, 
-			   ACE_Time_Value *timeout, 
-                           int restart,
-                           int reset_new_handle) const
-{
-  ACE_TRACE ("ACE_SOCK_Acceptor::accept");
-
-  int in_blocking_mode = 0;
-  if (this->shared_accept_start (timeout,
-				 restart,
-				 in_blocking_mode) == -1)
-    return -1;
-  else
-    {
-      // On Win32 the third parameter to <accept> must be a NULL
-      // pointer if we want to ignore the client's address.
-      int *len_ptr = 0;
-      int len = 0;
-      sockaddr *addr = 0;
-
-      if (remote_addr != 0)
-	{
-	  len = remote_addr->get_size ();
-          len_ptr = &len;
-	  addr = (sockaddr *) remote_addr->get_addr ();
-	}
-
-      do
-	new_stream.set_handle (ACE_OS::accept (this->get_handle (),
-					       addr,
-					       len_ptr,
-					       qos_params));
-      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 
-	  && remote_addr != 0)
-	remote_addr->set_size (len);
-    }
-
-  return this->shared_accept_finish (new_stream,
-				     in_blocking_mode,
-				     reset_new_handle);
+  ACE_HANDLE new_handle = 
+    this->shared_accept (remote_addr, 
+                         timeout, 
+                         restart, 
+                         reset_new_handle);
+  new_stream.set_handle (new_handle);
+  return new_handle == ACE_INVALID_HANDLE ? -1 : 0;
 }
 
 // General purpose routine for performing server ACE_SOCK creation.
@@ -203,14 +50,9 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
 				      int protocol)
 {
   ACE_TRACE ("ACE_SOCK_Acceptor::ACE_SOCK_Acceptor");
-  if (this->open (local_sap,
-		  reuse_addr,
-		  protocol_family, 
-		  backlog,
-		  protocol) == -1)
-    ACE_ERROR ((LM_ERROR,
-		ASYS_TEXT ("%p\n"),
-		ASYS_TEXT ("ACE_SOCK_Acceptor")));
+  if (this->open (local_sap, reuse_addr, protocol_family, 
+		  backlog, protocol) == -1)
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SOCK_Acceptor")));
 }
 
 void
@@ -231,10 +73,8 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
   ACE_TRACE ("ACE_SOCK_Acceptor::open");
   int error = 0;
   
-  if (ACE_SOCK::open (SOCK_STREAM,
-		      protocol_family, 
-		      protocol,
-		      reuse_addr) == -1)
+  if (ACE_SOCK::open (SOCK_STREAM, protocol_family, 
+		      protocol, reuse_addr) == -1)
     error = 1;
 
   else if (protocol_family == PF_INET)
@@ -261,20 +101,95 @@ ACE_SOCK_Acceptor::open (const ACE_Addr &local_sap,
       else
         {
           if (ACE_OS::bind (this->get_handle (), 
-                            ACE_reinterpret_cast (sockaddr *,
-						  &local_inet_addr), 
+                            ACE_reinterpret_cast(sockaddr *, &local_inet_addr), 
                             sizeof local_inet_addr) == -1)
             error = 1;
         }
     }
-  else if (ACE_OS::bind (this->get_handle (),
-			 (sockaddr *) local_sap.get_addr (), 
+  else if (ACE_OS::bind (this->get_handle (), (sockaddr *) local_sap.get_addr (), 
                          local_sap.get_size ()) == -1)
     error = 1;
 
-  if (error || ACE_OS::listen (this->get_handle (),
-			       backlog) == -1)
+  if (error || ACE_OS::listen (this->get_handle (), backlog) == -1)
     this->close ();
 
   return error ? -1 : 0;
 }
+    
+// Performs the timed accept operation. 
+
+ACE_HANDLE
+ACE_SOCK_Acceptor::shared_accept (ACE_Addr *remote_addr, 
+				  ACE_Time_Value *timeout, 
+				  int restart,
+                                  int reset_new_handle) const
+{
+  ACE_TRACE ("ACE_SOCK_Acceptor::shared_accept");
+  ACE_UNUSED_ARG (reset_new_handle);
+
+  sockaddr *addr = 0;
+  int *len_ptr = 0;
+  int len;
+  ACE_HANDLE new_handle;
+  ACE_HANDLE handle = this->get_handle ();
+
+  if (remote_addr != 0)
+    {
+      len = remote_addr->get_size ();
+      len_ptr = &len;
+      addr = (sockaddr *) remote_addr->get_addr ();
+    }
+
+  // Handle the case where we're doing a timed <accept>.
+  if (timeout != 0)
+    {
+      if (ACE::handle_timed_accept (handle, timeout, restart) == -1)
+	return ACE_INVALID_HANDLE;
+      else
+	{
+	  int val = ACE::get_flags (handle);
+
+	  // Set the handle into non-blocking mode if it's not already
+	  // in it.
+	  if (ACE_BIT_DISABLED (val, ACE_NONBLOCK)
+	      && ACE::set_flags (handle, ACE_NONBLOCK) == -1)
+	    return ACE_INVALID_HANDLE;
+
+	  new_handle = ACE_OS::accept (handle, addr, len_ptr);
+
+	  if (ACE_BIT_DISABLED (val, ACE_NONBLOCK))
+	    {
+	      // We need to stash errno here because <ACE::clr_flags>
+	      // may reset it.
+	      int error = errno;
+
+	      // Only disable ACE_NONBLOCK if we weren't in
+	      // non-blocking mode originally.
+	      ACE::clr_flags (handle, ACE_NONBLOCK);
+	      ACE::clr_flags (new_handle, ACE_NONBLOCK);
+	      errno = error;
+	    }
+	}
+    }
+  else
+    {
+      // Perform a blocking accept.
+    
+      do
+	new_handle = ACE_OS::accept (handle, addr, len_ptr);
+      while (new_handle == ACE_INVALID_HANDLE && restart && errno == EINTR);
+    }
+
+#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, NULL, 0);      
+#endif /* ACE_WIN32 */
+
+  // Reset the size of the addr (really only necessary for the
+  // UNIX domain sockets).
+  if (new_handle != ACE_INVALID_HANDLE && remote_addr != 0)
+    remote_addr->set_size (*len_ptr);
+  
+  return new_handle;
+}
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index e7c301de34a..5f68e60030f 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -28,7 +28,8 @@
 class ACE_Export ACE_SOCK_Acceptor : public ACE_SOCK
 {
   // = TITLE
-  //     Defines a factory that creates new <ACE_Stream>s passively. 
+  //     Defines the format and interface for an <ACE_Stream>
+  //     acceptor.
 public:
   // = Initialization methods.
   ACE_SOCK_Acceptor (void);
@@ -51,26 +52,15 @@ public:
             int protocol = 0);
   // Initiate a passive mode socket.
 
-  // = Passive connection <accept> methods.
+  // = Passive connection acceptance method.
   int accept (ACE_SOCK_Stream &new_stream,
               ACE_Addr *remote_addr = 0,
               ACE_Time_Value *timeout = 0,
               int restart = 1,
               int reset_new_handle = 0) const;
-  // Accept a new <ACE_SOCK_Stream> connection.  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.
-
-  int accept (ACE_SOCK_Stream &new_stream,
-	      ACE_Accept_QoS_Params qos_params,
-              ACE_Addr *remote_addr = 0,
-              ACE_Time_Value *timeout = 0,
-              int restart = 1,
-              int reset_new_handle = 0) const;
-  // 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.
+  // Accept a new data transfer connection.  A <timeout> of 0 means
+  // block forever, a <timeout> of {0, 0} means poll.  <restart> == 1
+  // means "restart if interrupted."
 
   // = Meta-type info
   typedef ACE_INET_Addr PEER_ADDR;
@@ -83,17 +73,11 @@ public:
   // Declare the dynamic allocation hooks.
 
 protected:
-  int shared_accept_start (ACE_Time_Value *timeout,
-			   int restart,
-			   int &in_blocking_mode) const;
-  // Perform operations that must occur before <ACE_OS::accept> is
-  // called.
-
-  int shared_accept_finish (ACE_SOCK_Stream new_stream,
-			    int in_blocking_mode,
-			    int reset_new_handle) const;
-  // Perform operations that must occur after <ACE_OS::accept> is
-  // called.
+  ACE_HANDLE shared_accept (ACE_Addr *remote_addr,
+                            ACE_Time_Value *,
+                            int restart,
+                            int reset_new_handle) const;
+  // Shared by both the ACE_LSOCK_Acceptor and ACE_SOCK_Acceptor.
 
 private:
   int get_remote_addr (ACE_Addr &) const;
diff --git a/ace/SOCK_Connector.cpp b/ace/SOCK_Connector.cpp
index 9938d839f4a..0d2c4ddabb5 100644
--- a/ace/SOCK_Connector.cpp
+++ b/ace/SOCK_Connector.cpp
@@ -20,15 +20,22 @@ ACE_SOCK_Connector::dump (void) const
   ACE_TRACE ("ACE_SOCK_Connector::dump");
 }
 
-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)
+// 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_Time_Value *timeout,
+			     const ACE_Addr &local_sap,
+			     int reuse_addr,
+			     int /* flags */,
+			     int /* perms */,
+			     int protocol_family, 
+			     int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Connector::shared_connect_start");
+  ACE_TRACE ("ACE_SOCK_Connector::connect");
+  int result = 0;
+
   // 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,
@@ -36,126 +43,66 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream,
 			  protocol,
 			  reuse_addr) == -1)
     return -1;
-  else if (local_sap != ACE_Addr::sap_any)
+
+  sockaddr *raddr = (sockaddr *) remote_sap.get_addr ();
+  size_t rsize = remote_sap.get_size ();
+
+  if (local_sap != ACE_Addr::sap_any)
     {
       sockaddr *laddr = (sockaddr *) local_sap.get_addr ();
       size_t size = local_sap.get_size ();
-      if (ACE_OS::bind (new_stream.get_handle (),
-			laddr,
-			size) == -1)
+      result = ACE_OS::bind (new_stream.get_handle (),
+                             laddr,
+                             size);
+
+      if (result == -1)
 	{
-	  // Save/restore errno.
-	  ACE_Errno_Guard error (errno);
 	  new_stream.close ();
 	  return -1;
 	}
     }
 
   // Enable non-blocking, if required.
-  if (timeout != 0 && new_stream.enable (ACE_NONBLOCK) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-int 
-ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream,
-					   ACE_Time_Value *timeout,
-					   int result)
-{
-  ACE_TRACE ("ACE_SOCK_Connector::shared_connect_finish");
-  // Save/restore errno.
-  ACE_Errno_Guard error (errno);
-
-  if (result == -1 && timeout != 0)
+  if (timeout != 0)
     {
-      // Check whether the connection is in progress.
-      if (error == EINPROGRESS || error == EWOULDBLOCK)
+      if (new_stream.enable (ACE_NONBLOCK) == -1)
+	result = -1;
+      
+      if (ACE_OS::connect (new_stream.get_handle (), raddr, rsize) == -1)
 	{
-	  // This expression checks if we were polling.
-	  if (timeout->sec () == 0 && timeout->usec () == 0)
-	    error = EWOULDBLOCK;
-	  // Wait synchronously using timeout.
-	  else if (this->complete (new_stream,
-				   0,
-				   timeout) == -1)
-	    error = errno;
-	  else
-	    return 0;
+	  result = -1;
+
+	  // Check whether the connection is in progress.
+	  if (errno == EINPROGRESS || errno == EWOULDBLOCK)
+	    {
+	      // This expression checks if we were polling.
+	      if (timeout->sec () == 0 && timeout->usec () == 0)
+		errno = EWOULDBLOCK;
+	      // Wait synchronously
+	      else if (this->complete (new_stream, 0, timeout) != -1)
+		return 0;
+	    }
 	}
     }
+  // Do a blocking connect.
+  else if (ACE_OS::connect (new_stream.get_handle (), raddr, rsize) == -1)
+    result = -1;
 
   // EISCONN is treated specially since this routine may be used to
   // check if we are already connected.
-  if (result != -1 || error == EISCONN)
+  if (result != -1 || errno == EISCONN)
     // Start out with non-blocking disabled on the <new_stream>.
     new_stream.disable (ACE_NONBLOCK);
-  else if (!(error == EWOULDBLOCK || error == ETIMEDOUT))
-    new_stream.close ();
-
+  else if (!(errno == EWOULDBLOCK || errno == ETIMEDOUT))
+    {
+      // If things have gone wrong, close down and return an error.
+      int saved_errno = errno;
+      new_stream.close ();
+      errno = saved_errno;
+    }
+    
   return result;
 }
-// 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_Time_Value *timeout,
-			     const ACE_Addr &local_sap,
-			     int reuse_addr,
-			     int /* flags */,
-			     int /* perms */,
-			     int protocol_family, 
-			     int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Connector::connect");
-  if (this->shared_connect_start (new_stream,
-				  timeout,
-				  local_sap,
-				  reuse_addr,
-				  protocol_family,
-				  protocol) == -1)
-    return -1;
-
-  int result = ACE_OS::connect (new_stream.get_handle (),
-				(sockaddr *) remote_sap.get_addr (),
-				remote_sap.get_size ());
-
-  return this->shared_connect_finish (new_stream,
-				      timeout,
-				      result);
-}
-
-int
-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,
-			     int reuse_addr,
-			     int /* flags */,
-			     int /* perms */,
-			     int protocol_family, 
-			     int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Connector::connect");
-  if (this->shared_connect_start (new_stream,
-				  timeout,
-				  local_sap,
-				  reuse_addr,
-				  protocol_family,
-				  protocol) == -1)
-    return -1;
-
-  int result = ACE_OS::connect (new_stream.get_handle (),
-				(sockaddr *) remote_sap.get_addr (),
-				remote_sap.get_size (),
-				qos_params);
-
-  return this->shared_connect_finish (new_stream,
-				      timeout,
-				      result);
-}
 
 // Try to complete a non-blocking connection.
 
@@ -172,92 +119,39 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream,
   ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY);
   ACE_OS::sleep (time);
 #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */
-  ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (),
-					     tv);
-  // We failed to get connected.
+  ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), tv);
+
   if (h == ACE_INVALID_HANDLE)
     {
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
+      // Preserve the value of errno across the close() call.
+      int error = errno;
       new_stream.close ();
+      errno = error;
       return -1;
     }
-  else if (remote_sap != 0)
+  else 	  // We've successfully connected!
     {
-      int len = remote_sap->get_size ();
-      sockaddr *addr = (sockaddr *) remote_sap->get_addr ();
-
-      if (ACE_OS::getpeername (h,
-			       addr,
-			       &len) == -1)
+      if (remote_sap != 0)
 	{
-	  // Save/restore errno.
-	  ACE_Errno_Guard error (errno);
-	  new_stream.close ();
-	  return -1;
+	  int len;
+
+	  len = remote_sap->get_size ();
+	  sockaddr *addr = (sockaddr *) remote_sap->get_addr ();
+
+	  if (ACE_OS::getpeername (h, addr, &len) == -1)
+	    {
+	      // Preserve the value of errno across the close() call.
+	      int error = errno;
+	      new_stream.close ();
+	      errno = error;
+	      return -1;
+	    }
 	}
-    }
-
-  // Start out with non-blocking disabled on the <new_stream>.
-  new_stream.disable (ACE_NONBLOCK);
-  return 0;
-}
-
-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,
-					int flags,
-					int perms,
-					int protocol_family,
-					int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector");
 
-  if (this->connect (new_stream,
-		     remote_sap,
-		     timeout,
-		     local_sap,
-		     reuse_addr,
-		     flags,
-		     perms,
-		     protocol_family,
-		     protocol) == -1
-      && timeout != 0 
-      && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR,
-		ASYS_TEXT ("%p\n"),
-		ASYS_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector")));
+      // Start out with non-blocking disabled on the <new_stream>.
+      new_stream.disable (ACE_NONBLOCK);
+      return 0;
+    }
 }
 
-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,
-					int reuse_addr,
-					int flags,
-					int perms,
-					int protocol_family,
-					int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector");
-
-  if (this->connect (new_stream,
-		     remote_sap,
-		     qos_params,
-		     timeout,
-		     local_sap,
-		     reuse_addr,
-		     flags,
-		     perms,
-		     protocol_family,
-		     protocol) == -1
-      && 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 e6abeb6a0e9..57d52903f52 100644
--- a/ace/SOCK_Connector.h
+++ b/ace/SOCK_Connector.h
@@ -61,30 +61,8 @@ public:
   // 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 (ACE_SOCK_Stream &new_stream,
-                      const ACE_Addr &remote_sap,
-		      ACE_Connect_QoS_Params qos_params,
-                      ACE_Time_Value *timeout = 0,
-                      const ACE_Addr &local_sap = ACE_Addr::sap_any,
-                      int reuse_addr = 0,
-                      int flags = 0,
-                      int perms = 0,
-                      int protocol_family = 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 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.
 
   int connect (ACE_SOCK_Stream &new_stream,
                const ACE_Addr &remote_sap,
@@ -109,34 +87,6 @@ public:
   // 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,
-	       ACE_Connect_QoS_Params qos_params,
-	       ACE_Time_Value *timeout = 0,
-	       const ACE_Addr &local_sap = ACE_Addr::sap_any,
-	       int reuse_addr = 0,
-	       int flags = 0,
-	       int perms = 0,
-	       int protocol_family = 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 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.
-
   // = Completion routine.
   int complete (ACE_SOCK_Stream &new_stream,
                 ACE_Addr *remote_sap = 0,
@@ -158,20 +108,6 @@ public:
 
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
-
-protected:
-  int 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);
-  // Perform operations that must be called before <ACE_OS::connect>.
-
-  int shared_connect_finish (ACE_SOCK_Stream &new_stream,
-			     ACE_Time_Value *timeout,
-			     int result);
-  // Perform operations that must be called after <ACE_OS::connect>.
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
diff --git a/ace/SOCK_Connector.i b/ace/SOCK_Connector.i
index c4801c01cf0..ebce17c7f53 100644
--- a/ace/SOCK_Connector.i
+++ b/ace/SOCK_Connector.i
@@ -12,6 +12,24 @@ ACE_SOCK_Connector::~ACE_SOCK_Connector (void)
   ACE_TRACE ("ACE_SOCK_Connector::~ACE_SOCK_Connector");
 }
 
+ASYS_INLINE
+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,
+					int flags,
+					int perms,
+					int protocol_family,
+					int protocol)
+{
+  ACE_TRACE ("ACE_SOCK_Connector::ACE_SOCK_Connector");
+  if (this->connect (new_stream, remote_sap, timeout, local_sap,
+		     reuse_addr, flags, perms, protocol_family, protocol) == -1
+      && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector")));
+}
+
 // Do-nothing constructor...
 
 ASYS_INLINE
diff --git a/ace/SOCK_Dgram_Bcast.h b/ace/SOCK_Dgram_Bcast.h
index c74416f0714..0faf2391775 100644
--- a/ace/SOCK_Dgram_Bcast.h
+++ b/ace/SOCK_Dgram_Bcast.h
@@ -26,11 +26,8 @@
 
 class ACE_Export ACE_Bcast_Node
 {
-  // = TITLE
-  //   Linked list of broadcast interfaces.
 public:
-  ACE_Bcast_Node (ACE_INET_Addr &, 
-                  ACE_Bcast_Node *);
+  ACE_Bcast_Node (ACE_INET_Addr &, ACE_Bcast_Node *);
   ~ACE_Bcast_Node (void);
   // Default dtor.
 
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index 05ee72132c3..1a30f757e43 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -26,25 +26,29 @@ 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)
+ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
+                                 int reuse_addr,
+#if defined (ACE_PSOS)
+                                 // pSOS supports numbers, not
+                                 // names for network interfaces
+                                 long net_if,
+#else
+                                 const ASYS_TCHAR *net_if,
+#endif /* defined (ACE_PSOS) */
+                                 int protocol_family,
+                                 int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_i");
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe");
 
-  // Make a copy of address to use in the <send> methods.
+  // Make a local copy of address to use in sends.
   this->mcast_addr_.set (mcast_addr);
 
-  // Only perform the <open> initialization if we haven't been opened
-  // earlier.
+  // Only perform the open() initialization if we haven't been opened
+  // previously.
   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;
@@ -63,67 +67,61 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
 #endif /* SO_REUSEPORT */
 
       // Create an address to bind the socket to.
+
       ACE_INET_Addr local;
 
       if (local.set (this->mcast_addr_.get_port_number ()) == -1)
         return -1;
-      else if (ACE_SOCK_Dgram::shared_open (local,
-					    protocol_family) == -1)
+      else if (ACE_SOCK_Dgram::shared_open (local, protocol_family) == -1)
         return -1;
     }
 #if defined (ACE_WIN32)
-  // Windows NT's winsock has trouble with multicast subscribes in the
-  // presence of multiple network interfaces when the IP address is
-  // given as INADDR_ANY.  It will pick the first interface and only
-  // accept mcast there.  So, to work around this, cycle through all
-  // of the interfaces known and subscribe to all the non-loopback
-  // ones.
+  // Windows NT's winsock has trouble with multicast subscribes in the presence
+  // of multiple network interfaces when the IP address is given as INADDR_ANY.
+  // It will pick the first interface and only accept mcast there.  So, to work
+  // around this, cycle through all of the interfaces known and subscribe to
+  // all the non-loopback ones.
+  // Note that this only needs to be done on NT, but there's no way to tell
+  // at this point if the code will be running on NT - only if it is compiled
+  // for NT-only or for NT/95, and that doesn't really help us.  It doesn't
+  // hurt to do this on Win95, it's just a little slower than it normally
+  // would be.
   //
-  // Note that this only needs to be done on NT, but there's no way to
-  // tell at this point if the code will be running on NT - only if it
-  // is compiled for NT-only or for NT/95, and that doesn't really
-  // help us.  It doesn't hurt to do this on Win95, it's just a little
-  // slower than it normally would be.
-  //
-  // NOTE - <ACE::get_ip_interfaces> doesn't always get all of the
-  // interfaces.  In particular, it may not get a PPP interface.  This
-  // is a limitation of the way <ACE::get_ip_interfaces> works with
-  // MSVC.  The reliable way of getting the interface list is
-  // available only with MSVC 5.
+  // NOTE - get_ip_interfaces doesn't always get all of the interfaces.  In
+  // particular, it may not get a PPP interface.  This is a limitation of the
+  // way get_ip_interfaces works with MSVC.  The reliable way of getting the
+  // interface list is available only with MSVC 5.
 
   if (net_if == 0)
     {
       ACE_INET_Addr *if_addrs = 0;
-      size_t if_cnt;
+      size_t         if_cnt, nr_subscribed;
 
-      if (ACE::get_ip_interfaces (if_cnt,
-				  if_addrs) != 0)
+      if (ACE::get_ip_interfaces(if_cnt, if_addrs) != 0)
         return -1;
 
-      size_t nr_subscribed = 0;
+      nr_subscribed = 0;
 
       if (if_cnt < 2)
         {
-          if (this->subscribe (mcast_addr,
-			       reuse_addr,
-			       ASYS_WIDE_STRING ("0.0.0.0"),
-			       protocol_family,
-			       protocol) == 0)
+          if (this->subscribe(mcast_addr,
+                              reuse_addr,
+                              ASYS_WIDE_STRING ("0.0.0.0"),
+                              protocol_family,
+                              protocol) == 0)
             ++nr_subscribed;
         }
       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->subscribe (mcast_addr,
-				 reuse_addr,
-				 ASYS_WIDE_STRING (if_addrs[if_cnt].get_host_addr()),
-				 protocol_family,
-				 protocol) == 0)
+            if (this->subscribe(mcast_addr,
+                                reuse_addr,
+                                ASYS_WIDE_STRING (if_addrs[if_cnt].get_host_addr()),
+                                protocol_family,
+                                protocol) == 0)
               ++nr_subscribed;
           }
 
@@ -140,97 +138,56 @@ ACE_SOCK_Dgram_Mcast::subscribe_i (const ACE_INET_Addr &mcast_addr,
 #endif /* ACE_WIN32 */
 
   // Create multicast request.
-  if (this->make_multicast_address (this->mcast_addr_,
-				    net_if) == -1)
+  if (this->make_multicast_address (this->mcast_addr_, net_if) == -1)
     return -1;
-  else
-    return 0;
-}
 
-int
-ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
-                                 int reuse_addr,
-                                 const ASYS_TCHAR *net_if,
-                                 int protocol_family,
-                                 int protocol)
-{
-  if (this->subscribe_i (mcast_addr,
-			 reuse_addr,
-			 net_if,
-			 protocol_family,
-			 protocol) == -1)
-    return -1;
-  
   // Tell network device driver to read datagrams with a
-  // multicast_address IP interface.
+  // multicast_address address.
   else if (this->ACE_SOCK::set_option (IPPROTO_IP,
                                        IP_ADD_MEMBERSHIP,
-                                       &this->mcast_request_if_,
-                                       sizeof this->mcast_request_if_) == -1)
+                                       &multicast_address_,
+                                       sizeof multicast_address_) == -1)
     return -1;
-  else
-    return 0;
-}
-
-ACE_HANDLE
-ACE_SOCK_Dgram_Mcast::subscribe (const ACE_INET_Addr &mcast_addr,
-				 const ACE_Connect_QoS_Params &qos_params,
-                                 int reuse_addr,
-                                 const ASYS_TCHAR *net_if,
-                                 int protocol_family,
-                                 int protocol)
-{
-  if (this->subscribe_i (mcast_addr,
-			 reuse_addr,
-			 net_if,
-			 protocol_family,
-			 protocol) == -1)
-    return ACE_INVALID_HANDLE;
-  
-  // Tell network device driver to read datagrams with a
-  // <mcast_request_if_> IP interface.
-  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,
-                              qos_params);
+  return 0;
 }
 
 int
-ACE_SOCK_Dgram_Mcast::unsubscribe_i (const ACE_INET_Addr &mcast_addr,
-				     const ASYS_TCHAR *net_if,
-				     int protocol_family,
-				     int protocol)
+ACE_SOCK_Dgram_Mcast::unsubscribe (const ACE_INET_Addr &mcast_addr,
+#if defined (ACE_PSOS)
+                                   // pSOS supports numbers, not
+                                   // names for network interfaces
+                                   long net_if,
+#else
+                                   const ASYS_TCHAR *net_if,
+#endif /* defined (ACE_PSOS) */
+                                   int protocol_family,
+                                   int protocol)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe_i");
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe");
+
 #if defined (ACE_WIN32)
-  // Windows NT's winsock has trouble with multicast subscribes in the
-  // presence of multiple network interfaces when the IP address is
-  // given as INADDR_ANY.  It will pick the first interface and only
-  // accept mcast there.  So, to work around this, cycle through all
-  // of the interfaces known and subscribe to all the non-loopback
-  // ones.
-  //
-  // Note that this only needs to be done on NT, but there's no way to
-  // tell at this point if the code will be running on NT - only if it
-  // is compiled for NT-only or for NT/95, and that doesn't really
-  // help us.  It doesn't hurt to do this on Win95, it's just a little
-  // slower than it normally would be.
+  // Windows NT's winsock has trouble with multicast subscribes in the presence
+  // of multiple network interfaces when the IP address is given as INADDR_ANY.
+  // It will pick the first interface and only accept mcast there.  So, to work
+  // around this, cycle through all of the interfaces known and subscribe to
+  // all the non-loopback ones.
+  // Note that this only needs to be done on NT, but there's no way to tell
+  // at this point if the code will be running on NT - only if it is compiled
+  // for NT-only or for NT/95, and that doesn't really help us.  It doesn't
+  // hurt to do this on Win95, it's just a little slower than it normally
+  // would be.
   //
-  // NOTE - <ACE::get_ip_interfaces> doesn't always get all of the
-  // interfaces.  In particular, it may not get a PPP interface.  This
-  // is a limitation of the way <ACE::get_ip_interfaces> works with
-  // MSVC.  The reliable way of getting the interface list is
-  // available only with MSVC 5.
+  // NOTE - get_ip_interfaces doesn't always get all of the interfaces.  In
+  // particular, it may not get a PPP interface.  This is a limitation of the
+  // way get_ip_interfaces works with MSVC.  The reliable way of getting the
+  // interface list is available only with MSVC 5.
 
   if (net_if == 0)
     {
       ACE_INET_Addr *if_addrs = 0;
-      size_t if_cnt;
+      size_t         if_cnt;
 
-      if (ACE::get_ip_interfaces (if_cnt,
-				  if_addrs) != 0)
+      if (ACE::get_ip_interfaces(if_cnt, if_addrs) != 0)
         return -1;
 
       size_t nr_unsubscribed = 0;
@@ -246,8 +203,7 @@ 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,
@@ -274,32 +230,15 @@ 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)
+  if (this->make_multicast_address_i (mcast_addr, multicast_address, net_if) == -1)
     return -1;
-  else
-    return 0;
-}
 
-int
-ACE_SOCK_Dgram_Mcast::unsubscribe (const ACE_INET_Addr &mcast_addr,
-                                   const ASYS_TCHAR *net_if,
-                                   int protocol_family,
-                                   int protocol)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe");
-  if (this->unsubscribe_i (mcast_addr,
-			   net_if,
-			   protocol_family,
-			   protocol) == -1)
-    return -1;
   // 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)
+  else if (this->ACE_SOCK::set_option (IPPROTO_IP,
+                                       IP_DROP_MEMBERSHIP,
+                                       &multicast_address,
+                                       sizeof multicast_address) == -1)
     return -1;
   return 0;
 }
@@ -310,64 +249,76 @@ ACE_SOCK_Dgram_Mcast::unsubscribe (void)
   ACE_TRACE ("ACE_SOCK_Dgram_Mcast::unsubscribe");
   return this->ACE_SOCK::set_option (IPPROTO_IP,
                                      IP_DROP_MEMBERSHIP,
-                                     &this->mcast_request_if_,
-                                     sizeof this->mcast_request_if_);
+                                     &multicast_address_,
+                                     sizeof multicast_address_);
+}
+
+int
+ACE_SOCK_Dgram_Mcast::make_multicast_address (const ACE_INET_Addr &mcast_addr,
+#if defined (ACE_PSOS)
+                                              // pSOS supports numbers, not
+                                              // names for network interfaces
+                                              long net_if
+#else
+                                              const ASYS_TCHAR *net_if
+#endif /* defined (ACE_PSOS) */
+                                             )
+{
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::make_multicast_address");
+
+  return this->make_multicast_address_i (mcast_addr,
+                                         this->multicast_address_,
+                                         net_if );
 }
 
 int
 ACE_SOCK_Dgram_Mcast::make_multicast_address_i (const ACE_INET_Addr &mcast_addr,
                                                 ip_mreq &multicast_address ,
-                                                const ASYS_TCHAR *net_if)
+#if defined (ACE_PSOS)
+                                                // pSOS supports numbers, not
+                                                // names for network interfaces
+                                                long net_if
+#else
+                                                const ASYS_TCHAR *net_if
+#endif /* defined (ACE_PSOS) */
+                                                )
 {
   if (net_if != 0)
     {
-#if defined (ACE_WIN32)
-      // This port number is not necessary, just convenient
-      ACE_INET_Addr interface_addr;
-      if (interface_addr.set (mcast_addr.get_port_number (),
-                              net_if) == -1)
-        return -1;
-      multicast_address.imr_interface.s_addr =
-        htonl (interface_addr.get_ip_address ());
-#else
+#if !defined (ACE_WIN32)
       struct ifreq if_address;
 
 #if defined (ACE_PSOS)
-      // Look up the interface by number, not name.
-      if_address.ifr_ifno = ACE_OS::atoi (net_if);
+      // look up the interface by number, not name
+      if_address.ifr_ifno = net_if;
 #else
       ACE_OS::strcpy (if_address.ifr_name, net_if);
 #endif /* defined (ACE_PSOS) */
 
-      if (ACE_OS::ioctl (this->get_handle (),
-			 SIOCGIFADDR,
-			 &if_address) == -1)
+      if (ACE_OS::ioctl (this->get_handle (), SIOCGIFADDR, &if_address) == -1)
         return -1;
 
       struct sockaddr_in *socket_address;
       socket_address = ACE_reinterpret_cast(sockaddr_in *,
                                             &if_address.ifr_addr);
       multicast_address.imr_interface.s_addr = socket_address->sin_addr.s_addr;
+#else
+      // This port number is not necessary, just convenient
+      ACE_INET_Addr interface_addr;
+      if (interface_addr.set (mcast_addr.get_port_number (),
+                              net_if) == -1)
+        return -1;
+      multicast_address.imr_interface.s_addr =
+        htonl (interface_addr.get_ip_address ());
 #endif /* ACE_WIN32 */
     }
   else
     multicast_address.imr_interface.s_addr = INADDR_ANY;
 
 #if defined (ACE_PSOS) && !defined (ACE_PSOS_TM) && !defined (ACE_PSOS_DIAB_MIPS)
-  multicast_address.imr_mcastaddr.s_addr = htonl (mcast_addr.get_ip_address());
+  multicast_address.imr_mcastaddr.s_addr = htonl(mcast_addr.get_ip_address());
 #else
   multicast_address.imr_multiaddr.s_addr = htonl (mcast_addr.get_ip_address ());
 #endif /* defined (ACE_PSOS) */
   return 0;
 }
-
-int
-ACE_SOCK_Dgram_Mcast::make_multicast_address (const ACE_INET_Addr &mcast_addr,
-                                              const ASYS_TCHAR *net_if)
-{
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::make_multicast_address");
-
-  return this->make_multicast_address_i (mcast_addr,
-                                         this->mcast_request_if_,
-                                         net_if );
-}
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index 7b8a1c24955..55d3ba832dd 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -10,9 +10,8 @@
 //    SOCK_Dgram_Mcast.h
 //
 // = AUTHORS
-//    Irfan Pyrali <irfan@cs.wustl.edu>,
-//    Tim Harrison <harrison@cs.wustl.edu>, and
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
+//    Irfan Pyrali (ip1@cs.wustl.edu)
+//    Tim Harrison (harrison@cs.wustl.edu)
 //
 // ============================================================================
 
@@ -30,15 +29,15 @@
 class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram
 {
   // = TITLE
-  //     Defines the member functions for the ACE socket wrapper
-  //     for UDP/IP multicast.
+  //     Defines the member functions for the ACE SOCK wrapper
+  //     multicast abstraction.
 public:
   // = Initialization routine.
   ACE_SOCK_Dgram_Mcast (void);
-  // Note that there is no public <open> method.  Therefore, this
-  // class cannot be used unless you <subscribe> to a multicast group.
-  // If you just want to send (and not listen) to a multicast group,
-  // use <ACE_SOCK_Dgram> or <ACE_SOCK_CODgram> instead.
+  // Note that there is no <open>.  This cannot be used unless you
+  // subscribe to the multicast group.  If you just want to send (and
+  // not listen) to the multicast group, use ACE_SOCK_Dgram or
+  // ACE_SOCK_CODgram.
 
   ~ACE_SOCK_Dgram_Mcast (void);
   // Default dtor.
@@ -47,63 +46,41 @@ public:
 
   int subscribe (const ACE_INET_Addr &mcast_addr,
                  int reuse_addr = 1,
+#if defined (ACE_PSOS)
+                 // pSOS supports numbers, not names for network interfaces
+                 long net_if = 0,
+#else
                  const ASYS_TCHAR *net_if = 0,
+#endif /* defined (ACE_PSOS) */
                  int protocol_family = PF_INET,
                  int protocol = 0);
-  // This is a BSD-style method for joining a multicast group (i.e.,
-  // no QoS).  The network interface device driver is instructed to
-  // accept datagrams with <mcast_addr> multicast addresses.  If the
-  // socket has already been opened, <subscribe> closes the socket and
-  // opens a new socket bound to the <mcast_addr>.
+  // Join a multicast group by telling the network interface device
+  // driver to accept datagrams with ACE_INET_Addr &mcast_addr
+  // multicast addresses.
   //
-  // 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: -1 on error, else 0.
-  // 
-  // Note that some platforms, such as pSoS, support only number, not
-  // names, for network interfaces.  For these platforms, just give
-  // these numbers in alphanumeric form and <subscribe> will convert
-  // them into numbers via <ACE_OS::atoi>.
-
-  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
-  // <mcast_addr> multicast addresses.  If the socket has already been
-  // opened, <subscribe> closes the socket and opens a new socket
-  // bound to the <mcast_addr>.
+  // If you have called open already, subscribe closes the socket and
+  // opens a new socket bound to the mcast_addr.
   //
-  // 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: 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
-  // these numbers in alphanumeric form and <subscribe> will convert
-  // them into numbers via <ACE_OS::atoi>.
+  // Interface is hardware specific. use netstat -i to find whether
+  // your interface is, say, le0 or something else.  If net_if == 0,
+  // subscribe uses the default mcast interface.
+  // Returns: -1 on error, else 0.
 
   int unsubscribe (const ACE_INET_Addr &mcast_addr,
+#if defined (ACE_PSOS)
+                   // pSOS supports numbers, not names for network interfaces
+                   long net_if = 0,
+#else
                    const ASYS_TCHAR *net_if = 0,
+#endif /* defined (ACE_PSOS) */
                    int protocol_family = PF_INET,
                    int protocol = 0);
-  // Leave a multicast group identified by <mcast_addr>.  The <net_if>
-  // interface is hardware specific.  Use something like "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: -1 on error, else 0.
-  // 
-  // Note that some platforms, such as pSoS, support only number, not
-  // names, for network interfaces.  For these platforms, just give
-  // these numbers in alphanumeric form and <subscribe> will convert
-  // them into numbers via <ACE_OS::atoi>.
+  // Leave a multicast group.
+  //
+  // Interface is hardware specific. use netstat -i to find whether
+  // your interface is, say, le0 or something else.  If net_if == 0,
+  // subscribe uses the default mcast interface.
+  // Returns: -1 on error, else 0.
 
   int unsubscribe (void);
   // Unsubscribe from a multicast group.  Returns 0 on success, -1 on
@@ -121,12 +98,11 @@ public:
   // Send <n> <iovecs>.
 
   // = Options.
-  int set_option (int option, 
-		  char optval);
-  // Set an ip option that takes a char as input, such as
-  // <IP_MULTICAST_LOOP>.  This is just a more concise nice interface
-  // to a subset of possible <ACE_SOCK::set_option> calls.  Returns 0
-  // on success, -1 on failure.
+  int set_option (int option, char optval);
+  // Set an ip option that takes a char as input.
+  // e.g. IP_MULTICAST_LOOP.  This is just a nice interface to a
+  // subset of possible setsockopt/ACE_SOCK::set_option calls Returns
+  // 0 on success, -1 on failure.
 
   void dump (void) const;
   // Dump the state of an object.
@@ -138,24 +114,10 @@ private:
   ACE_HANDLE open (const ACE_Addr &local,
                    int protocol_family = PF_INET,
                    int protocol = 0);
-  // Disable public use of <ACE_SOCK_Dgram::open> to ensure the class
-  // is used properly.
-
-  int subscribe_i (const ACE_INET_Addr &mcast_addr,
-		   int reuse_addr = 1,
-		   const ASYS_TCHAR *net_if = 0,
-		   int protocol_family = PF_INET,
-		   int protocol = 0);
-  // Implementation method of <subscribe>.
-
-  int unsubscribe_i (const ACE_INET_Addr &mcast_addr,
-		     const ASYS_TCHAR *net_if = 0,
-		     int protocol_family = PF_INET,
-		     int protocol = 0);
-  // Implementation method of <unsubscribe>.
-
-  // = Disable public use of <ACE_SOCK_Dgram::send>s and force
-  // <ACE_SOCK_Dgram_Mcast::send>s inline.
+  // disable public use of ACE_SOCK_Dgram::open ()
+
+  // = Disable public use of ACE_SOCK_Dgram::sends and force
+  // ACE_SOCK_Dgram_Mcast::sends inline
   ssize_t send (const void *buf,
                 size_t n,
                 const ACE_Addr &addr,
@@ -166,25 +128,37 @@ private:
                 int flags = 0) const;
 
   int make_multicast_address (const ACE_INET_Addr &mcast_addr,
-                              const ASYS_TCHAR *net_if = ASYS_TEXT ("le0"));
-  // Initialize the <multicast_address_> IP address.
+#if defined (ACE_PSOS)
+                              // pSOS supports numbers, not
+                              // names for network interfaces
+                              long net_if = 0
+#else
+                              const ASYS_TCHAR *net_if = ASYS_TEXT ("le0")
+#endif /* defined (ACE_PSOS) */
+                             );
+  // Initialize the <multicast_addres_ field>
 
   int make_multicast_address_i (const ACE_INET_Addr &mcast_addr,
                                 ip_mreq& multicast_address,
-                                const ASYS_TCHAR *net_if = ASYS_TEXT ("le0"));
-  // Initialize a multicast address.  This method factors out common
-  // code called by <make_multicast_address> and <subscribe>.
+#if defined (ACE_PSOS)
+                                // pSOS supports numbers, not
+                                // names for network interfaces
+                                long net_if = 0
+#else
+                                const ASYS_TCHAR *net_if = ASYS_TEXT ("le0")
+#endif /* defined (ACE_PSOS) */
+                                );
+  // Initialize a multicast address.
 
   ACE_INET_Addr mcast_addr_;
-  // A copy of the address that we use to <send> multicasts.
+  // Multicast group address.
 
-  ip_mreq mcast_request_if_;
-  // IP address of the interface upon which we're receiving
-  // multicasts.
+  ip_mreq multicast_address_;
+  // IP address.
 };
 
 #if !defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/SOCK_Dgram_Mcast.i"
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
+#endif
 
 #endif /* ACE_SOCK_DGRAM_MCAST_H */
diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp
index 85c0445cdd9..ede9445b6cd 100644
--- a/ace/SPIPE_Addr.cpp
+++ b/ace/SPIPE_Addr.cpp
@@ -74,7 +74,6 @@ ACE_SPIPE_Addr::set (const ACE_SPIPE_Addr &sa)
 // Copy constructor.
 
 ACE_SPIPE_Addr::ACE_SPIPE_Addr (const ACE_SPIPE_Addr &sa)
-  : ACE_Addr (AF_SPIPE, sizeof this->SPIPE_addr_)
 {
   this->set (sa);
 }
@@ -144,7 +143,6 @@ ACE_SPIPE_Addr::set (LPCTSTR addr,
 ACE_SPIPE_Addr::ACE_SPIPE_Addr (LPCTSTR addr,
 				gid_t gid, 
 				uid_t uid)
-  : ACE_Addr (AF_SPIPE, sizeof this->SPIPE_addr_)
 {
   this->set (addr, gid, uid);
 }
diff --git a/ace/SPIPE_Stream.h b/ace/SPIPE_Stream.h
index eec059af87d..f21e17ed423 100644
--- a/ace/SPIPE_Stream.h
+++ b/ace/SPIPE_Stream.h
@@ -108,19 +108,6 @@ public:
   ssize_t recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const;
   // Recv <n> bytes via Win32 ReadFile using overlapped I/O.
 
-  ssize_t sendv (const iovec iov[],
-                 size_t n) const;
-  // Send an <iovec> of size <n> to the stream.
-
-  ssize_t sendv_n (const iovec iov[],
-                   size_t n) const;
-  // Send an <iovec> of size <n> to the stream.  Will block until all
-  // bytes are sent or an error occurs.
-
-  ssize_t recvv_n (iovec iov[],
-                   size_t n) const;
-  // Receive an <iovec> of size <n> to the stream.
-
   // = Meta-type info
   typedef ACE_SPIPE_Addr PEER_ADDR;
 
diff --git a/ace/SPIPE_Stream.i b/ace/SPIPE_Stream.i
index 4733a628815..d790a2f0c53 100644
--- a/ace/SPIPE_Stream.i
+++ b/ace/SPIPE_Stream.i
@@ -155,44 +155,6 @@ ACE_SPIPE_Stream::recv (void *buf, size_t n,
                         ACE_OVERLAPPED *overlapped) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv");
-  return ACE_OS::read (this->get_handle (),
-                       (char *) buf, n,
+  return ACE_OS::read (this->get_handle (), (char *) buf, n,
                        overlapped);
 }
-
-ASYS_INLINE ssize_t
-ACE_SPIPE_Stream::sendv_n (const iovec iov[],
-                           size_t n) const
-{
-  ACE_TRACE ("ACE_SPIPE_Stream::sendv_n");
-  return ACE::writev_n (this->get_handle (),
-                        iov,
-                        n);
-}
-
-// Recv an n byte message from the Stream.
-
-ASYS_INLINE ssize_t
-ACE_SPIPE_Stream::recvv_n (iovec iov[],
-                           size_t n) const
-{
-  ACE_TRACE ("ACE_SPIPE_Stream::recvv_n");
-  // @@ Carlos, can you please update this to call the
-  // new ACE::recvv_n() method that you write?
-  return ACE_OS::readv (this->get_handle (),
-                        iov,
-                        n);
-}
-
-// Send an <iovec> of size <n> to the Stream.
-
-ASYS_INLINE ssize_t
-ACE_SPIPE_Stream::sendv (const iovec iov[],
-                         size_t n) const
-{
-  ACE_TRACE ("ACE_SPIPE_Stream::sendv");
-  return ACE_OS::writev (this->get_handle (),
-                         iov,
-                         n);
-}
-
diff --git a/ace/Service_Types.cpp b/ace/Service_Types.cpp
index 228b0e8bb8c..2b808ea9c3d 100644
--- a/ace/Service_Types.cpp
+++ b/ace/Service_Types.cpp
@@ -405,7 +405,6 @@ ACE_Service_Object_Type::fini (void) const
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Message_Queue<ACE_SYNCH>;
-template class ACE_Message_Queue_Iterator<ACE_SYNCH>;
 template class ACE_Message_Queue_Factory<ACE_SYNCH>;
 template class ACE_Dynamic_Message_Queue<ACE_SYNCH>;
 template class ACE_Module<ACE_SYNCH>;
@@ -418,7 +417,6 @@ template class ACE_Thru_Task<ACE_SYNCH>;
 // Even with threads, these ACE_NULL_SYNCH specializations are necessary.
 #if defined (ACE_HAS_THREADS)
   template class ACE_Message_Queue<ACE_NULL_SYNCH>;
-  template class ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>;
   template class ACE_Message_Queue_Factory<ACE_NULL_SYNCH>;
   template class ACE_Dynamic_Message_Queue<ACE_NULL_SYNCH>;
   template class ACE_Module<ACE_NULL_SYNCH>;
@@ -427,7 +425,6 @@ template class ACE_Thru_Task<ACE_SYNCH>;
 #endif /* ACE_HAS_THREADS */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Message_Queue<ACE_SYNCH>
-#pragma instantiate ACE_Message_Queue_Iterator<ACE_SYNCH>
 #pragma instantiate ACE_Message_Queue_Factory<ACE_SYNCH>
 #pragma instantiate ACE_Dynamic_Message_Queue<ACE_SYNCH>
 #pragma instantiate ACE_Module<ACE_SYNCH>
@@ -439,7 +436,6 @@ template class ACE_Thru_Task<ACE_SYNCH>;
 // Even with threads, these ACE_NULL_SYNCH specializations are necessary.
 #if defined (ACE_HAS_THREADS)
   #pragma instantiate ACE_Message_Queue<ACE_NULL_SYNCH>
-  #pragma instantiate ACE_Message_Queue_Iterator<ACE_NULL_SYNCH>
   #pragma instantiate ACE_Message_Queue_Factory<ACE_NULL_SYNCH>
   #pragma instantiate ACE_Dynamic_Message_Queue<ACE_NULL_SYNCH>
   #pragma instantiate ACE_Module<ACE_NULL_SYNCH>
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 16fd4fef9f5..859076fcde1 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -320,8 +320,8 @@ ACE_Sig_Handler::dispatch (int signum,
           ACE_TSS_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
 #endif /* 0 */
 
-  // Save/restore errno.
-  ACE_Errno_Guard error (errno);
+  // Preserve errno across callbacks!
+  int old_errno = errno;
 
   // We can't use the <sig_pending> call here because that acquires
   // the lock, which is non-portable...
@@ -351,6 +351,9 @@ ACE_Sig_Handler::dispatch (int signum,
       eh->handle_close (ACE_INVALID_HANDLE,
                         ACE_Event_Handler::SIGNAL_MASK);
     }
+
+  // Restore error when callback completes.
+  errno = old_errno;
 }
 
 ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Action &sa, int sigkey)
@@ -683,8 +686,8 @@ ACE_Sig_Handlers::dispatch (int signum,
     ACE_TSS_Guard<ACE_Recursive_Thread_Mutex> m (*lock));
 #endif /* 0 */
 
-  // Save/restore errno.
-  ACE_Errno_Guard error (errno);
+  // Preserve errno across callbacks!
+  int old_errno = errno;
 
   ACE_Sig_Handler::sig_pending_ = 1;
 
@@ -706,6 +709,9 @@ ACE_Sig_Handlers::dispatch (int signum,
           delete *eh;
         }
     }
+
+  // Restore error when callback completes.
+  errno = old_errno;
 }
 
 // Return the first item in the list of handlers.  Note that this will
diff --git a/ace/Strategies.cpp b/ace/Strategies.cpp
index edd7ca41f57..82515e14ddc 100644
--- a/ace/Strategies.cpp
+++ b/ace/Strategies.cpp
@@ -87,3 +87,4 @@ ACE_Connection_Recycling_Strategy::~ACE_Connection_Recycling_Strategy (void)
 }
 
 #endif /* ACE_STRATEGIES_C */
+
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index a936a9a2047..921d2b0a8dc 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -15,9 +15,8 @@ static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
                                         const char *svc_name);
 
 #define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext)
-
 // Force the pretty debugging code to compile.
-// #define YYDEBUG 1
+#define YYDEBUG 1
 
 // Efficient memory allocation technique.
 ACE_Obstack *ace_obstack;
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index 9083f7fd7e1..d92ca5f05bc 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -19,14 +19,13 @@ static ACE_Module_Type *ace_get_module (ACE_Static_Node *str_rec,
                                         const char *svc_name);
 
 #define ACE_YYDEBUG_LEXER_TEXT (ace_yytext[ace_yyleng] = '\0', ace_yytext)
-
 /* Force the pretty debugging code to compile.*/
-/* #define ACE_YYDEBUG 1*/
+#define ACE_YYDEBUG 1
 
 /* Efficient memory allocation technique.*/
 ACE_Obstack *ace_obstack;
 
-#line 30 "Svc_Conf_y.cpp"
+#line 29 "Svc_Conf_y.cpp"
 #define ACE_DYNAMIC 257
 #define ACE_STATIC 258
 #define ACE_SUSPEND 259
@@ -170,7 +169,7 @@ short ace_yycheck[] = {                                       8,
 #endif
 #define ACE_YYMAXTOKEN 276
 #if ACE_YYDEBUG
-const char *ace_yyname[] = {
+char *ace_yyname[] = {
 "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -183,7 +182,7 @@ const char *ace_yyname[] = {
 "ACE_IDENT","ACE_STRING","ACE_LPAREN","ACE_RPAREN","ACE_LBRACE","ACE_RBRACE",
 "ACE_STAR","ACE_COLON",
 };
-const char *ace_yyrule[] = {
+char *ace_yyrule[] = {
 "$accept : svc_config_entries",
 "svc_config_entries : svc_config_entries svc_config_entry",
 "svc_config_entries : svc_config_entries error",
@@ -250,7 +249,7 @@ ACE_YYSTYPE ace_yylval;
 #define ace_yystacksize ACE_YYSTACKSIZE
 short ace_yyss[ACE_YYSTACKSIZE];
 ACE_YYSTYPE ace_yyvs[ACE_YYSTACKSIZE];
-#line 315 "Svc_Conf.y"
+#line 314 "Svc_Conf.y"
 // Prints the error string to standard output.  Cleans up the error
 // messages.
 
@@ -396,7 +395,7 @@ main (int argc, char *argv[])
   return ace_yyparse ();
 }
 #endif /* DEBUGGING */
-#line 400 "Svc_Conf_y.cpp"
+#line 399 "Svc_Conf_y.cpp"
 #define ACE_YYABORT goto ace_yyabort
 #define ACE_YYACCEPT goto ace_yyaccept
 #define ACE_YYERROR goto ace_yyerrlab
@@ -424,7 +423,7 @@ int ace_yyindent;
 #endif /* ACE_YYDEBUG_INDENT */
 #ifndef ACE_YYDEBUG_REDUCE
 #ifdef __cplusplus
-void ACE_YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, const char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
+void ACE_YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
 #else
 ACE_YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count)
 int ace_yynew_state;
@@ -454,7 +453,7 @@ int ace_yyrhs_count;
 #endif /* ACE_YYDEBUG_REDUCE */
 #ifndef ACE_YYDEBUG_SHIFT_LEXEME
 #ifdef __cplusplus
-void ACE_YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state*/, const char *ace_yytoken_string, int ace_yynew_indent)
+void ACE_YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state*/, char *ace_yytoken_string, int ace_yynew_indent)
 #else
 ACE_YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent)
 int ace_yyold_state;
@@ -469,7 +468,7 @@ int ace_yynew_indent;
 #endif /*  ACE_YYDEBUG_SHIFT_LEXEME */
 #ifndef ACE_YYDEBUG_LOOK_AHEAD
 #ifdef __cplusplus
-void ACE_YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent)
+void ACE_YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
 #else
 ACE_YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
 int ace_yynew_state;
@@ -514,7 +513,7 @@ int ace_yyindent;
 #endif /* ACE_YYDEBUG_DISCARD_STATE */
 #ifndef ACE_YYDEBUG_DISCARD_TOKEN
 #ifdef __cplusplus
-void ACE_YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, const char *ace_yytoken_string, int ace_yyindent)
+void ACE_YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, char *ace_yytoken_string, int ace_yyindent)
 #else
 ACE_YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
 int ace_yynew_state;
@@ -550,7 +549,7 @@ ace_yyparse()
 {
     register int ace_yym, ace_yyn, ace_yystate;
 #if ACE_YYDEBUG
-    register const char *ace_yys;
+    register char *ace_yys;
 #ifndef __cplusplus
     extern char *ace_foo();
 #endif
@@ -703,7 +702,7 @@ ace_yyreduce:
     switch (ace_yyn)
     {
 case 1:
-#line 45 "Svc_Conf.y"
+#line 44 "Svc_Conf.y"
 {
       if (ace_yyvsp[0].parse_node_ != 0)
       {
@@ -713,13 +712,13 @@ case 1:
     }
 break;
 case 2:
-#line 53 "Svc_Conf.y"
+#line 52 "Svc_Conf.y"
 {
       ace_obstack->release ();
     }
 break;
 case 10:
-#line 70 "Svc_Conf.y"
+#line 69 "Svc_Conf.y"
 {
       if (ace_yyvsp[-1].svc_record_ != 0)
         ace_yyval.parse_node_ = new ACE_Dynamic_Node (ace_yyvsp[-1].svc_record_, ace_yyvsp[0].ident_);
@@ -728,74 +727,74 @@ case 10:
     }
 break;
 case 11:
-#line 80 "Svc_Conf.y"
+#line 79 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Static_Node (ace_yyvsp[-1].ident_, ace_yyvsp[0].ident_);
     }
 break;
 case 12:
-#line 87 "Svc_Conf.y"
+#line 86 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Suspend_Node (ace_yyvsp[0].ident_);
     }
 break;
 case 13:
-#line 94 "Svc_Conf.y"
+#line 93 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Resume_Node (ace_yyvsp[0].ident_);
     }
 break;
 case 14:
-#line 101 "Svc_Conf.y"
+#line 100 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Remove_Node (ace_yyvsp[0].ident_);
     }
 break;
 case 15:
-#line 108 "Svc_Conf.y"
+#line 107 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Stream_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_);
     }
 break;
 case 16:
-#line 111 "Svc_Conf.y"
+#line 110 "Svc_Conf.y"
 { ace_yyval.static_node_ = new ACE_Static_Node (ace_yyvsp[0].ident_); }
 break;
 case 17:
-#line 112 "Svc_Conf.y"
+#line 111 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = new ACE_Dummy_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_);
     }
 break;
 case 18:
-#line 119 "Svc_Conf.y"
+#line 118 "Svc_Conf.y"
 {
     }
 break;
 case 19:
-#line 122 "Svc_Conf.y"
+#line 121 "Svc_Conf.y"
 {
     }
 break;
 case 20:
-#line 128 "Svc_Conf.y"
+#line 127 "Svc_Conf.y"
 {
       /* Initialize left context...*/
       ace_yyval.static_node_ = ace_yyvsp[-1].static_node_;
     }
 break;
 case 21:
-#line 133 "Svc_Conf.y"
+#line 132 "Svc_Conf.y"
 {
       ace_yyval.parse_node_ = ace_yyvsp[-1].parse_node_;
     }
 break;
 case 22:
-#line 136 "Svc_Conf.y"
+#line 135 "Svc_Conf.y"
 { ace_yyval.parse_node_ = 0; }
 break;
 case 23:
-#line 141 "Svc_Conf.y"
+#line 140 "Svc_Conf.y"
 {
       if (ace_yyvsp[0].parse_node_ != 0)
         {
@@ -805,11 +804,11 @@ case 23:
     }
 break;
 case 24:
-#line 148 "Svc_Conf.y"
+#line 147 "Svc_Conf.y"
 { ace_yyval.parse_node_ = 0; }
 break;
 case 25:
-#line 153 "Svc_Conf.y"
+#line 152 "Svc_Conf.y"
 {
       ACE_Static_Node *svc_type = ace_yyvsp[0].static_node_;
 
@@ -837,7 +836,7 @@ case 25:
     }
 break;
 case 26:
-#line 179 "Svc_Conf.y"
+#line 178 "Svc_Conf.y"
 {
       ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
 
@@ -850,7 +849,7 @@ case 26:
     }
 break;
 case 27:
-#line 190 "Svc_Conf.y"
+#line 189 "Svc_Conf.y"
 {
       ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_,
                                             ace_yyvsp[0].static_node_->name ());
@@ -859,7 +858,7 @@ case 27:
     }
 break;
 case 28:
-#line 197 "Svc_Conf.y"
+#line 196 "Svc_Conf.y"
 {
       ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_,
                                             ace_yyvsp[0].static_node_->name ());
@@ -868,7 +867,7 @@ case 28:
     }
 break;
 case 29:
-#line 204 "Svc_Conf.y"
+#line 203 "Svc_Conf.y"
 {
       ACE_Static_Node *stream = ace_yyvsp[-2].static_node_;
       ACE_Static_Node *module = ace_yyvsp[0].static_node_;
@@ -890,7 +889,7 @@ case 29:
     }
 break;
 case 30:
-#line 227 "Svc_Conf.y"
+#line 226 "Svc_Conf.y"
 {
       u_int flags
         = ACE_Service_Type::DELETE_THIS
@@ -923,64 +922,64 @@ case 30:
     }
 break;
 case 31:
-#line 261 "Svc_Conf.y"
+#line 260 "Svc_Conf.y"
 {
       ace_yyval.type_ = 1;
     }
 break;
 case 32:
-#line 265 "Svc_Conf.y"
+#line 264 "Svc_Conf.y"
 {
       ace_yyval.type_ = 0;
     }
 break;
 case 33:
-#line 269 "Svc_Conf.y"
+#line 268 "Svc_Conf.y"
 {
       ace_yyval.type_ = 1;
     }
 break;
 case 34:
-#line 276 "Svc_Conf.y"
+#line 275 "Svc_Conf.y"
 {
       ace_yyval.location_node_ = new ACE_Object_Node (ace_yyvsp[-2].ident_, ace_yyvsp[0].ident_);
     }
 break;
 case 35:
-#line 280 "Svc_Conf.y"
+#line 279 "Svc_Conf.y"
 {
       ace_yyval.location_node_ = new ACE_Function_Node (ace_yyvsp[-4].ident_, ace_yyvsp[-2].ident_);
     }
 break;
 case 36:
-#line 284 "Svc_Conf.y"
+#line 283 "Svc_Conf.y"
 {
       ace_yyval.location_node_ = new ACE_Static_Function_Node (ace_yyvsp[-2].ident_);
     }
 break;
 case 37:
-#line 291 "Svc_Conf.y"
+#line 290 "Svc_Conf.y"
 {
       ace_yyval.type_ = ACE_MODULE_T;
     }
 break;
 case 38:
-#line 295 "Svc_Conf.y"
+#line 294 "Svc_Conf.y"
 {
       ace_yyval.type_ = ACE_SVC_OBJ_T;
     }
 break;
 case 39:
-#line 299 "Svc_Conf.y"
+#line 298 "Svc_Conf.y"
 {
       ace_yyval.type_ = ACE_STREAM_T;
     }
 break;
 case 41:
-#line 306 "Svc_Conf.y"
+#line 305 "Svc_Conf.y"
 { ace_yyval.ident_ = 0; }
 break;
-#line 983 "Svc_Conf_y.cpp"
+#line 982 "Svc_Conf_y.cpp"
     }
     ace_yyssp -= ace_yym;
     ace_yystate = *ace_yyssp;
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index effa6ab4608..56d4e15074b 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -99,20 +99,19 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Svc_Handler (ACE_Thread_Manager *tm
   // work correctly in multi-threaded programs by using our ACE_TSS
   // class.
   this->dynamic_ = ACE_Dynamic::instance ()->is_dynamic ();
-
-  if (this->dynamic_ != 0)
-    // Make sure to reset the flag.
+  if (this->dynamic_)
+    // Make sure to reset the flag
     ACE_Dynamic::instance ()->reset ();
 }
 
-// Default behavior for a ACE_Svc_Handler object is to be registered
-// with the ACE_Reactor (thereby ensuring single threading).
+// Default behavior for a ACE_Svc_Handler object is to be registered with
+// the ACE_Reactor (thereby ensuring single threading).
 
 template <PR_ST_1, ACE_SYNCH_DECL> int
 ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *)
 {
   ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open");
-#if defined (ACE_DEBUGGING)
+#if defined (DEBUGGING)
   ASYS_TCHAR buf[BUFSIZ];
   ACE_PEER_STREAM_ADDR client_addr;
 
@@ -130,7 +129,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *)
               ASYS_TEXT ("connected to %s on fd %d\n"),
               buf,
               this->peer_.get_handle ()));
-#endif /* ACE_DEBUGGING */
+#endif /* DEBUGGING */
   if (this->reactor ()
       && this->reactor ()->register_handler
       (this,
@@ -183,20 +182,6 @@ template <PR_ST_1, ACE_SYNCH_DECL> void
 ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const
 {
   ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump");
-
-  this->peer_.dump ();
-  ACE_DEBUG ((LM_DEBUG,
-              "dynamic_ = %d\n",
-              this->dynamic_));
-  ACE_DEBUG ((LM_DEBUG,
-              "closing_ = %d\n",
-              this->closing_));
-  ACE_DEBUG ((LM_DEBUG,
-              "recycler_ = %d\n",
-              this->recycler_));
-  ACE_DEBUG ((LM_DEBUG,
-              "recycling_act_ = %d\n",
-              this->recycling_act_));
 }
 
 template <PR_ST_1, ACE_SYNCH_DECL> ACE_PEER_STREAM &
@@ -328,168 +313,6 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::recycle (void *)
   return 0;
 }
 
-template <PR_ST_1, ACE_SYNCH_DECL>
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::~ACE_Buffered_Svc_Handler (void)
-{
-  this->flush ();
-}
-
-template <PR_ST_1, ACE_SYNCH_DECL>
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Buffered_Svc_Handler (ACE_Thread_Manager *tm,
-                                                                            ACE_Message_Queue<ACE_SYNCH_USE> *mq,
-                                                                            ACE_Reactor *reactor,
-                                                                            size_t maximum_buffer_size,
-                                                                            ACE_Time_Value *timeout)
-  : ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE> (tm, mq, reactor),
-    maximum_buffer_size_ (maximum_buffer_size),
-    current_buffer_size_ (0),
-    timeoutp_ (timeout)
-{
-  ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::ACE_Buffered_Svc_Handler");
-
-  if (this->timeoutp_ != 0)
-    {
-      this->interval_ = *timeout;
-      this->next_timeout_ = ACE_OS::gettimeofday () + this->interval_;
-    }
-}
-
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::put (ACE_Message_Block *mb,
-                                                       ACE_Time_Value *tv)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->msg_queue ()->lock (), -1);
-
-  // Enqueue <mb> onto the message queue.
-  if (this->putq (mb, tv) == -1)
-    return -1;
-  else
-    {
-      // Update the current number of bytes on the queue.
-      this->current_buffer_size_ += mb->total_size ();
-
-      // Flush the buffer when the number of bytes exceeds the maximum
-      // buffer size or when the timeout period has elapsed.
-      if (this->current_buffer_size_ >= this->maximum_buffer_size_
-          || (this->timeoutp_ != 0
-              && this->next_timeout_ <= ACE_OS::gettimeofday ()))
-        return this->flush ();
-      else
-        return 0;
-    }
-}
-
-// Flush the buffer.
-
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::flush (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->msg_queue ()->lock (), -1);
-  ACE_Message_Block *entry = 0;
-  iovec iov[IOV_MAX];
-  size_t i = 0;
-  int result = 0;
-
-  // Iterate over all the <ACE_Message_Block>s in the
-  // <ACE_Message_Queue> and prepare them to be written out.
-  for (ACE_Message_Queue_Iterator<ACE_SYNCH_USE> iterator (*this->msg_queue ());
-       iterator.next (entry) != 0
-         && result == 0;
-       iterator.advance ())
-    {
-      // Iterate over all the <Message_Block>s in a chain, including
-      // continuations.
-      for (ACE_Message_Block *temp = entry;
-           temp != 0;
-           temp = temp->cont ())
-        {
-          iov[i].iov_len = temp->length ();
-          iov[i].iov_base = temp->rd_ptr ();
-
-          i++;
-
-          // Flush the <iovec>s when we've reached the maximum size
-          // for the platform.
-          if (i == IOV_MAX)
-            {
-#if defined (ACE_DEBUGGING)
-              ACE_DEBUG ((LM_DEBUG,
-                          "sending data (inside loop, i = %d)\n",
-                          i));
-#endif /* ACE_DEBUGGING */
-              // Send off the data.
-              if (this->peer ().sendv_n (iov,
-                                         i) == -1)
-                {
-                  result = -1;
-                  break;
-                }
-              i = 0;
-            }
-        }
-    }
-
-  // Take care of any remaining <iovec>s.
-  if (i > 0 && result != -1)
-    {
-      if (this->peer ().sendv_n (iov, i) == -1)
-        result = -1;
-#if defined (ACE_DEBUGGING)
-      ACE_DEBUG ((LM_DEBUG,
-                  "sending data (final flush, i = %d)\n",
-                  i));
-#endif /* ACE_DEBUGGING */
-    }
-
-  // Remove all the <ACE_Message_Block>s in the <ACE_Message_Queue>
-  // and <release> their memory.
-  while (this->msg_queue ()->is_empty () == 0)
-    {
-      if (this->msg_queue ()->dequeue_head (entry) == -1)
-        break;
-
-      entry->release ();
-    }
-
-  if (this->timeoutp_ != 0)
-    // Update the next timeout period by adding the interval.
-    this->next_timeout_ += this->interval_;
-
-  this->current_buffer_size_ = 0;
-
-  return result;
-}
-
-template <PR_ST_1, ACE_SYNCH_DECL> void
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump (void) const
-{
-  ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump");
-
-  ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::dump ();
-  ACE_DEBUG ((LM_DEBUG,
-              "maximum_buffer_size_ = %d\n",
-              this->maximum_buffer_size_));
-  ACE_DEBUG ((LM_DEBUG,
-              "current_buffer_size_ = %d\n",
-              this->current_buffer_size_));
-  if (this->timeoutp_ != 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "next_timeout_.sec = %d, next_timeout_.usec = %d\n",
-                this->next_timeout_.sec (),
-                this->next_timeout_.usec ()));
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "timeoutp_ == NULL"));
-}
-
-template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout (const ACE_Time_Value &,
-                                                                  const void *)
-{
-  ACE_TRACE ("ACE_Buffered_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_timeout");
-  return 0;
-}
-
 #undef PR_ST_1
 #undef PR_ST_2
 #endif /* ACE_SVC_HANDLER_C */
diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h
index a1251999404..b84b825be42 100644
--- a/ace/Svc_Handler.h
+++ b/ace/Svc_Handler.h
@@ -48,23 +48,18 @@ class ACE_Svc_Handler : public ACE_Task<ACE_SYNCH_USE>
   //     ACE_Svc_Handler and the peer it is connected with.
 public:
   // = Initialization and termination methods.
-  ACE_Svc_Handler (ACE_Thread_Manager *thr_mgr = 0,
-                   ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0,
-                   ACE_Reactor *reactor = ACE_Reactor::instance ());
-  // Constructor initializes the <thr_mgr> and <mq> by passing them
-  // down to the <ACE_Task> base class.  The <reactor> is passed to
-  // the <ACE_Event_Handler>.
+  ACE_Svc_Handler (ACE_Thread_Manager * = 0,
+                   ACE_Message_Queue<ACE_SYNCH_USE> * = 0,
+                   ACE_Reactor * = ACE_Reactor::instance ());
 
   virtual ~ACE_Svc_Handler (void);
-  // Destructor.
 
   virtual int open (void * = 0);
-  // Activate the client handler.  This is typically called by the
-  // <ACE_Acceptor> or <ACE_Connector>.
+  // Activate the client handler (called by the ACE_Acceptor or
+  // ACE_Connector).
 
   virtual int close (u_long flags = 0);
-  // Object termination hook -- application-specific cleanup code goes
-  // here.
+  // Object termination hook.
 
   virtual int idle (u_long flags = 0);
   // Call this method if you want to recycling the <Svc_Handler>
@@ -138,9 +133,8 @@ public:
 
 public:
 
-  // = The following methods are not suppose to be public.  
-
-  // Because friendship is *not* inherited in C++, these methods have
+  // Note: The following methods are not suppose to be public.  But
+  // because friendship is *not* inherited in C++, these methods have
   // to be public.
 
   // = Accessors to set/get the connection recycler.
@@ -162,7 +156,7 @@ public:
   // recycling.  Return 0 if the object is ready for recycling, -1 on
   // failures.
 
-protected:
+private:
   ACE_PEER_STREAM peer_;
   // Maintain connection with client.
 
@@ -177,76 +171,7 @@ protected:
   // Pointer to the connection recycler.
 
   const void *recycling_act_;
-  // Asynchronous Completion Token (ACT) to be used to when talking to
-  // the recycler.
-};
-
-template <ACE_PEER_STREAM_1, ACE_SYNCH_DECL>
-class ACE_Buffered_Svc_Handler : public ACE_Svc_Handler<ACE_PEER_STREAM_2, ACE_SYNCH_USE>
-{
-  // = TITLE
-  //     Defines the interface for a service that exchanges data with
-  //     its connected peer and supports buffering.
-  //
-  // = DESCRIPTION
-  //      The buffering feature makes it possible to queue up
-  //      <ACE_Message_Blocks> in an <ACE_Message_Queue> until (1) the
-  //      queue is "full" or (2) a period of time elapses, at which
-  //      point the queue is "flushed" via <sendv_n> to the peer.
-public:
-  // = Initialization and termination methods.
-  ACE_Buffered_Svc_Handler (ACE_Thread_Manager *thr_mgr = 0,
-                            ACE_Message_Queue<ACE_SYNCH_USE> *mq = 0,
-                            ACE_Reactor *reactor = ACE_Reactor::instance (),
-                            size_t max_buffer_size = 0,
-                            ACE_Time_Value *relative_timeout = 0);
-  // Constructor initializes the <thr_mgr> and <mq> by passing them
-  // down to the <ACE_Task> base class.  The <reactor> is passed to
-  // the <ACE_Event_Handler>.  The <max_buffer_size> and
-  // <relative_timeout> are used to determine at what point to flush
-  // the <mq>.  By default, there's no buffering at all.  The
-  // <relative_timeout> value is interpreted to be in a unit that's
-  // relative to the current time returned by <ACE_OS::gettimeofday>.
-
-  virtual ~ACE_Buffered_Svc_Handler (void);
-  // Destructor, which calls <flush>.
-
-  virtual int put (ACE_Message_Block *message_block,
-                   ACE_Time_Value *timeout = 0);
-  // Insert the <ACE_Message_Block> chain rooted at <message_block>
-  // into the <ACE_Message_Queue> with the designated <timeout>.  The
-  // <flush> method will be called if this <put> causes the number of
-  // bytes to exceed the maximum buffer size or if the timeout period
-  // has elapsed.
-
-  virtual int flush (void);
-  // Flush the <ACE_Message_Queue>, which writes all the queued
-  // <ACE_Message_Block>s to the <PEER_STREAM>.
-
-  virtual int handle_timeout (const ACE_Time_Value &time,
-                              const void *);
-  // This method is not currently implemented -- this is where the
-  // integration with the <Reactor> would occur.
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-protected:
-  size_t maximum_buffer_size_;
-  // Maximum size the <Message_Queue> can be before we have to flush
-  // the buffer.
-
-  size_t current_buffer_size_;
-  // Current size in bytes of the <Message_Queue> contents.
-  
-  ACE_Time_Value next_timeout_;
-  // Timeout value used to control when the buffer is flushed.
-
-  ACE_Time_Value interval_;
-  // Interval of the timeout.
-
-  ACE_Time_Value *timeoutp_;
-  // Timeout pointer.
+  // ACT to be used to when talking to the recycler.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index ed9e6b821c1..1d2e8421c74 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -993,14 +993,12 @@ ACE_RW_Thread_Mutex::dump (void) const
 template class ACE_Guard<ACE_Thread_Mutex>;
 template class ACE_Guard<ACE_RW_Thread_Mutex>;
 template class ACE_Read_Guard<ACE_RW_Thread_Mutex>;
-template class ACE_Read_Guard<ACE_Thread_Mutex>;
 template class ACE_Write_Guard<ACE_RW_Thread_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 // These are only specialized with ACE_HAS_THREADS.
 #pragma instantiate ACE_Guard<ACE_Thread_Mutex>
 #pragma instantiate ACE_Guard<ACE_RW_Thread_Mutex>
 #pragma instantiate ACE_Read_Guard<ACE_RW_Thread_Mutex>
-#pragma instantiate ACE_Read_Guard<ACE_Thread_Mutex>
 #pragma instantiate ACE_Write_Guard<ACE_RW_Thread_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 5946d443182..4984d772f13 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -410,18 +410,16 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj)
     {
       if (this->ts_init () == -1)
         {
-          // Save/restore errno.
-          ACE_Errno_Guard error (errno);
+          int errnum = errno;
           // What should we do if this call fails?!
 #if defined (ACE_HAS_WINCE)
-          ::MessageBox (NULL,
-                        L"ACE_Thread::keycreate() failed!",
-                        L"ACE_TSS::ACE_TSS",
-                        MB_OK);
+          ::MessageBox (NULL, L"ACE_Thread::keycreate() failed!",
+                        L"ACE_TSS::ACE_TSS", MB_OK);
 #else
           ACE_OS::fprintf (stderr,
                            "ACE_Thread::keycreate() failed!");
 #endif /* ACE_HAS_WINCE */
+          errno = errnum;
           return;
         }
 
diff --git a/ace/Template_Instantiations.cpp b/ace/Template_Instantiations.cpp
index c21501d45e3..f881982b6e4 100644
--- a/ace/Template_Instantiations.cpp
+++ b/ace/Template_Instantiations.cpp
@@ -87,9 +87,8 @@ template class ACE_Cleanup_Adapter<ACE_SYNCH_RW_MUTEX>;
 
 template class ACE_Cleanup_Adapter<ACE_Thread_Mutex>;
 template class ACE_Double_Linked_List<ACE_Thread_Descriptor>;
-template class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor>;
 template class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
-template class ACE_Double_Linked_List_Reverse_Iterator<ACE_Thread_Descriptor>;
+
 // ACE_SYNCH_RECURSIVE_MUTEX is defined in Synch_T.h
 template class ACE_Event_Handler_Handle_Timeout_Upcall<ACE_SYNCH_RECURSIVE_MUTEX>;
 
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index b4210955aa6..337a378dbd2 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -6,7 +6,6 @@
 #include "ace/Dynamic.h"
 #include "ace/Object_Manager.h"
 #include "ace/Singleton.h"
-#include "ace/Auto_Ptr.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Thread_Manager.i"
@@ -603,7 +602,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
   // Create a new thread running <func>.  *Must* be called with the
   // <lock_> held...
 #if 1
-  auto_ptr<ACE_Thread_Descriptor> new_thr_desc (this->thread_desc_freelist_.remove ());
+  ACE_Thread_Descriptor *new_thr_desc = this->thread_desc_freelist_.remove ();
   new_thr_desc->thr_state_ = ACE_THR_IDLE;
   // Get a "new" Thread Descriptor from the freelist.
 
@@ -619,31 +618,25 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
                   -1);
 #endif /* 1 */
 
-  ACE_Thread_Adapter *thread_args = 0;
-# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
-  ACE_NEW_RETURN (thread_args,
-                  ACE_Thread_Adapter (func,
-                                      args,
-                                      (ACE_THR_C_FUNC) ace_thread_adapter,
-                                      this,
-                                      new_thr_desc.get (),
-                                      ACE_LOG_MSG->seh_except_selector(),
-                                      ACE_LOG_MSG->seh_except_handler()),
-                  -1);
+  ACE_Thread_Adapter *thread_args =
+    new ACE_Thread_Adapter (func,
+                            args,
+#if defined(ACE_USE_THREAD_MANAGER_ADAPTER)
+                            (ACE_THR_C_FUNC) ace_thread_manager_adapter,
 #else
-  ACE_NEW_RETURN (thread_args,
-                  ACE_Thread_Adapter (func,
-                                      args,
-                                      (ACE_THR_C_FUNC) ace_thread_adapter,
-                                      this,
-                                      new_thr_desc.get ()),
-                  -1);
+                            (ACE_THR_C_FUNC) ace_thread_adapter,
+#endif
+                            this,
+                            new_thr_desc
+# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
+                            , ACE_LOG_MSG->seh_except_selector()
+                            , ACE_LOG_MSG->seh_except_handler()
 # endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
+                            );
 
-  // @@ Memory leak if the previous new failed, need an auto pointer here.
   if (thread_args == 0)
     {
-      this->thr_list_.insert_head (new_thr_desc.release ());
+      delete new_thr_desc;
       return -1;
     }
 
@@ -719,7 +712,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func,
                                grp_id,
                                task,
                                flags,
-                               new_thr_desc.release ());
+                               new_thr_desc);
     }
 }
 
@@ -1164,12 +1157,13 @@ ACE_Thread_Manager::kill_thr (ACE_Thread_Descriptor *td, int signum)
       return -1; \
     } \
   int result = OP (ptr, ARG); \
-  ACE_Errno_Guard error (errno); \
+  int error = errno; \
   while (! this->thr_to_be_removed_.is_empty ()) { \
     ACE_Thread_Descriptor *td; \
     this->thr_to_be_removed_.dequeue_head (td); \
     this->remove_thr (td, 1); \
   } \
+  errno = error; \
   return result
 
 // Suspend a single thread.
@@ -1355,13 +1349,12 @@ ACE_Thread_Manager::apply_grp (int grp_id,
 
   if (! this->thr_to_be_removed_.is_empty ())
     {
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
-
-      for (ACE_Thread_Descriptor *td;
-           this->thr_to_be_removed_.dequeue_head (td) != -1;
-           )
+      // Preserve errno!
+      int error = errno;
+      ACE_Thread_Descriptor *td;
+      while (this->thr_to_be_removed_.dequeue_head (td) != -1)
         this->remove_thr (td, 1);
+      errno = error;
     }
 
   return result;
@@ -1426,13 +1419,12 @@ ACE_Thread_Manager::apply_all (ACE_THR_MEMBER_FUNC func, int arg)
 
   if (! this->thr_to_be_removed_.is_empty ())
     {
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
-
-      for (ACE_Thread_Descriptor *td;
-           this->thr_to_be_removed_.dequeue_head (td) != -1;
-           )
+      // Preserve errno!
+      int error = errno;
+      ACE_Thread_Descriptor *td;
+      while (this->thr_to_be_removed_.dequeue_head (td) != -1)
         this->remove_thr (td, 1);
+      errno = error;
     }
 
   return result;
@@ -1872,13 +1864,12 @@ ACE_Thread_Manager::apply_task (ACE_Task_Base *task,
 
   if (! this->thr_to_be_removed_.is_empty ())
     {
-      // Save/restore errno.
-      ACE_Errno_Guard error (errno);
-
-      for (ACE_Thread_Descriptor *td;
-           this->thr_to_be_removed_.dequeue_head (td) != -1;
-           )
+      // Preserve errno!
+      int error = errno;
+      ACE_Thread_Descriptor *td;
+      while (this->thr_to_be_removed_.dequeue_head (td) != -1)
         this->remove_thr (td, 1);
+      errno = error;
     }
 
   return result;
@@ -2366,13 +2357,9 @@ ACE_Thread_Control::exit (void *exit_status, int do_thr_exit)
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Auto_Basic_Ptr<ACE_Thread_Descriptor>;
-  template class auto_ptr<ACE_Thread_Descriptor>;
   template class ACE_Double_Linked_List<ACE_Thread_Descriptor_Base>;
-  template class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor_Base>;
   template class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor_Base>;
   template class ACE_Double_Linked_List<ACE_Thread_Descriptor>;
-  template class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor>;
   template class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
   template class ACE_Node<ACE_Thread_Descriptor*>;
   template class ACE_Unbounded_Queue<ACE_Thread_Descriptor*>;
@@ -2385,13 +2372,9 @@ ACE_Thread_Control::exit (void *exit_status, int do_thr_exit)
     template class ACE_TSS<ACE_Thread_Exit>;
 # endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #pragma instantiate ACE_Auto_Basic_Ptr<ACE_Thread_Descriptor>
-  #pragma instantiate auto_ptr<ACE_Thread_Descriptor>
   #pragma instantiate ACE_Double_Linked_List<ACE_Thread_Descriptor_Base>
-  #pragma instantiate ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor_Base>
   #pragma instantiate ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor_Base>
   #pragma instantiate ACE_Double_Linked_List<ACE_Thread_Descriptor>
-  #pragma instantiate ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor>
   #pragma instantiate ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>
   #pragma instantiate ACE_Node<ACE_Thread_Descriptor*>
   #pragma instantiate ACE_Unbounded_Queue<ACE_Thread_Descriptor*>
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index cfe72b4122d..105a52e0c72 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -156,10 +156,8 @@ class ACE_Thread_Descriptor_Base : public ACE_OS_Thread_Descriptor
 
   friend class ACE_Thread_Manager;
   friend class ACE_Double_Linked_List<ACE_Thread_Descriptor_Base>;
-  friend class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor_Base>;
   friend class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor_Base>;
   friend class ACE_Double_Linked_List<ACE_Thread_Descriptor>;
-  friend class ACE_Double_Linked_List_Iterator_Base<ACE_Thread_Descriptor>;
   friend class ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor>;
 public:
   ACE_Thread_Descriptor_Base (void);
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/Token_Collection.cpp b/ace/Token_Collection.cpp
index e275942ea22..c1d4ab17e15 100644
--- a/ace/Token_Collection.cpp
+++ b/ace/Token_Collection.cpp
@@ -88,16 +88,13 @@ ACE_Token_Collection::acquire (int notify,
        iterator.advance ())
     {
       if (debug_)
-	ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("collection acquiring %s\n"),
+	ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("collection acquiring %s\n"),
 		    temp->int_id_->name ()));
-      if (temp->int_id_->acquire (notify,
-                                  sleep_hook,
-                                  options) == -1)
+      if (temp->int_id_->acquire (notify, sleep_hook, options) == -1)
 	{
-          // Save/restore errno.
-          ACE_Errno_Guard error (errno);
+	  int error = errno;
 	  this->release ();
+	  errno = error;
 	  ACE_RETURN (-1);
 	}
     }
diff --git a/ace/Version.h b/ace/Version.h
index d995936b89d..73a4cf3341e 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 41
-#define ACE_VERSION "4.6.41"
+#define ACE_BETA_VERSION 40
+#define ACE_VERSION "4.6.40"
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index cac8478bca0..dd18973d49b 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -29,7 +29,6 @@
 # define ACE_HAS_STRING_CLASS
   // Denotes that GNU has cstring.h as standard, to redefine memchr().
 # define ACE_HAS_GNU_CSTRING_H
-# define ACE_HAS_SSIZE_T
 # define ACE_MALLOC_ALIGN 8
 
 # if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
@@ -150,7 +149,6 @@
 #define ACE_HAS_TIMOD_H
 #define ACE_HAS_TIUSER_H
 #define ACE_HAS_TLI
-#define ACE_HAS_BROKEN_T_ERROR
 #define ACE_HAS_TLI_PROTOTYPES
 #define ACE_TLI_TCP_DEVICE  "/dev/xti/tcp"
 
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 46de4084b34..d3d1bd384da 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -11,11 +11,21 @@
 #if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
   // egcs or g++ >= 2.8.0
 
-# define ACE_HAS_ANSI_CASTS
-# define ACE_HAS_CPLUSPLUS_HEADERS
-# define ACE_HAS_STDCPP_STL_INCLUDES
-# define ACE_HAS_TEMPLATE_TYPEDEFS
-# define ACE_HAS_TYPENAME_KEYWORD
+# if __GNUC__ == 2 && __GNUC_MINOR__ >= 90
+    // egcs or really modern g++.  Do these work with g++ 2.8.0?
+#   define ACE_HAS_ANSI_CASTS
+#   define ACE_HAS_CPLUSPLUS_HEADERS
+#   define ACE_HAS_STDCPP_STL_INCLUDES
+#   define ACE_HAS_TEMPLATE_TYPEDEFS
+#   define ACE_HAS_TYPENAME_KEYWORD
+# else
+    // Let's find out
+#   define ACE_HAS_ANSI_CASTS
+#   define ACE_HAS_CPLUSPLUS_HEADERS
+#   define ACE_HAS_STDCPP_STL_INCLUDES
+#   define ACE_HAS_TEMPLATE_TYPEDEFS
+#   define ACE_HAS_TYPENAME_KEYWORD
+# endif /* __GNUC__ >= 2.90 */
 
 # if __GNUC__ == 2 && __GNUC_MINOR__ >= 91
 #   define ACE_HAS_USING_KEYWORD
@@ -42,10 +52,6 @@
 #   define ACE_HAS_EXCEPTIONS
 # endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */
 
-# if defined (ACE_HAS_EXCEPTIONS)
-#   define ACE_NEW_THROWS_EXCEPTIONS
-# endif /* ACE_HAS_EXCEPTIONS */
-
 #else  /* ! egcs */
   // Plain old g++.
 # define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
@@ -59,10 +65,10 @@
 
 #if defined (i386) || defined (__i386__)
   // If running an Intel, assume that it's a Pentium so that
-  // ACE_OS::gethrtime () can use the RDTSC instruction.  If running a
-  // 486 or lower, be sure to comment this out.  (If not running an
-  // Intel CPU, this #define will not be seen because of the i386
-  // protection, so it can be ignored.)
+  // ACE_OS::gethrtime () can use the RDTSC instruction.  If
+  // running a 486 or lower, be sure to comment this out.
+  // (If not running an Intel CPU, this #define will not be seen
+  //  because of the i386 protection, so it can be ignored.)
 # define ACE_HAS_PENTIUM
 #endif /* i386 */
 
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index f43e757d156..11c525d72bd 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -59,10 +59,6 @@
 // Compiler enforces the "One Definition Rule"
 #  define ACE_HAS_ONE_DEFINITION_RULE
 
-// Compiler enforces need for 'template<>" when specializing templates
-#  define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-
-// Compiler enforces proper use of 'typename'
 #  define ACE_HAS_TYPENAME_KEYWORD
 
 // Compiler implements templates that support typedefs inside of classes
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index 4ac7f03d324..27a575b60e9 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -159,9 +159,6 @@ extern int h_errno;     /* This isn't declared in a header file on HP-UX */
 
 // Platform supports ACE_TLI, including SVR4 facilities.
 #define ACE_HAS_TLI
-
-// t_error's arg is char *, not const char *
-#define ACE_HAS_BROKEN_T_ERROR
 // ACE_HAS_SVR4_TLI should work on HP-UX, but doesn't yet.  Riverace
 // problem ID P27.
 //#define ACE_HAS_SVR4_TLI
diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h
index a3a491587c5..d6b42ba31c9 100644
--- a/ace/config-linux-lxpthreads.h
+++ b/ace/config-linux-lxpthreads.h
@@ -28,6 +28,10 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
+// AIO Stuff is present here. Eventhough I could nt get the
+// $ACE_ROOT/examples/Reactor/Proactor/<anything> to work.  
+#define ACE_HAS_AIO_CALLS
+
 #include "ace/config-linux-common.h"
 
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
diff --git a/ace/config-mvs.h b/ace/config-mvs.h
index 4eb1f8bdd33..985760cdedd 100644
--- a/ace/config-mvs.h
+++ b/ace/config-mvs.h
@@ -23,7 +23,6 @@
 
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
 
 // See the README file in this directory
 // for a description of the following ACE_ macros
@@ -104,8 +103,8 @@
 #endif /* ACE_NTRACE */
 
 #define ACE_SIZEOF_FLOAT 4
-#define ACE_SIZEOF_DOUBLE 8
-#define ACE_SIZEOF_LONG_DOUBLE 16
+#define ACE_SIZEOF_DOUBLE 4
+#define ACE_SIZEOF_LONG_DOUBLE 4
 #define ACE_HAS_DIRENT
 #define ACE_LACKS_READDIR_R
 
diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h
index 8bc6f9cf027..551d99cbda5 100644
--- a/ace/config-psos-diab-ppc.h
+++ b/ace/config-psos-diab-ppc.h
@@ -89,8 +89,6 @@
 
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-
 #define ACE_LACKS_SEMBUF_T
 
 #define ACE_LACKS_EXEC
diff --git a/ace/config-qnx-neutrino.h b/ace/config-qnx-neutrino.h
deleted file mode 100644
index cea218e345b..00000000000
--- a/ace/config-qnx-neutrino.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// $Id$
-
-// The following configuration file is designed to work for Neutrino
-// 2.0 (Beta) with GNU C++ and the POSIX (pthread) threads package.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-
-// gcc can do inline
-#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
-# if !defined (__ACE_INLINE__)
-#   define __ACE_INLINE__
-# endif /* ! __ACE_INLINE__ */
-#endif
-
-#include "ace/config-g++-common.h"
-
-// The following defines the Neutrino compiler.
-// gcc should know to call g++ as necessary
-#ifdef __GNUC__
-# define ACE_CC_NAME "gcc"
-#else
-# define ACE_CC_NAME "NTO compiler ??"
-#endif
-
-// /usr/nto/include/float.h defines
-//  FLT_MAX_EXP 127
-//  DBL_MAX_EXP 1023
-//  ace expects 128 & 1024 respectively
-//  to set the following macros in ace/Basic_Types.h
-//  These macros are:
-#define ACE_SIZEOF_DOUBLE   8
-#define ACE_SIZEOF_FLOAT    4
-
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#define ACE_HAS_ALLOCA
-#define ACE_HAS_ALLOCA_H
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-#define ACE_HAS_CLOCK_GETTIME
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-#define ACE_HAS_DIRENT
-#define ACE_HAS_GETPAGESIZE
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
-#define ACE_HAS_IDTYPE_T
-#define ACE_HAS_INLINED_OSCALLS
-#define ACE_HAS_IP_MULTICAST
-#define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
-#define ACE_HAS_MSG
-#define ACE_HAS_MT_SAFE_MKTIME
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-#define ACE_HAS_POSIX_SEM
-#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_STD
-#define ACE_HAS_PTHREAD_SIGMASK
-#define ACE_HAS_P_READ_WRITE
-#define ACE_HAS_REENTRANT_FUNCTIONS
-#define ACE_HAS_SELECT_H
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_SIGWAIT
-#define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_SIG_MACROS
-#define ACE_HAS_SIN_LEN
-#define ACE_HAS_SIZET_SOCKET_LEN
-#define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
-#define ACE_HAS_SVR4_GETTIMEOFDAY
-#define ACE_HAS_TERM_IOCTLS
-#define ACE_HAS_THREADS
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-#define ACE_HAS_THR_C_DEST
-#define ACE_HAS_THR_C_FUNC
-#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
-#define ACE_HAS_UALARM
-#define ACE_HAS_UCONTEXT_T
-#define ACE_HAS_VOIDPTR_MMAP
-#define ACE_HAS_VOIDPTR_SOCKOPT
-#define ACE_LACKS_CMSG_DATA_MEMBER
-#define ACE_LACKS_CONDATTR_PSHARED
-#define ACE_LACKS_CONST_TIMESPEC_PTR
-#define ACE_LACKS_FORK
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#define ACE_LACKS_MADVISE
-#define ACE_LACKS_MSGBUF_T
-#define ACE_LACKS_MUTEXATTR_PSHARED
-#define ACE_LACKS_NAMED_POSIX_SEM
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_LACKS_RLIMIT
-#define ACE_LACKS_RLIMIT_PROTOTYPE
-#define ACE_LACKS_RPC_H
-#define ACE_LACKS_RTTI
-#define ACE_LACKS_RWLOCK_T
-#define ACE_LACKS_SBRK
-#define ACE_LACKS_SEEKDIR
-#define ACE_LACKS_SOCKETPAIR
-#define ACE_LACKS_SOME_POSIX_PROTOTYPES
-#define ACE_LACKS_STREAM_MODULES
-#define ACE_LACKS_STRRECVFD
-#define ACE_LACKS_SYSCALL
-#define ACE_LACKS_SYSTIME_H
-#define ACE_LACKS_SYSV_MSG_H
-#define ACE_LACKS_SYSV_SHMEM
-#define ACE_LACKS_TCP_NODELAY
-#define ACE_LACKS_TELLDIR
-#define ACE_LACKS_TIMESPEC_T
-#define ACE_LACKS_TRUNCATE
-#define ACE_LACKS_T_ERRNO
-#define ACE_LACKS_UALARM_PROTOTYPE
-#define ACE_LACKS_UCONTEXT_H
-#define ACE_LACKS_UNIX_DOMAIN_SOCKETS
-#define ACE_LACKS_U_LONGLONG_T
-#define ACE_MT_SAFE 1
-#define ACE_NEEDS_FUNC_DEFINITIONS
-#define ACE_NEEDS_HUGE_THREAD_STACKSIZE 64000
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
-
-#if !defined (ACE_NTRACE)
-# define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index ca9cbe52d16..f6d7acdf9f5 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -32,11 +32,6 @@
 #   define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 #   define ACE_USES_OLD_IOSTREAMS 1
 #   define ACE_HAS_THR_C_DEST
-
-#  if !defined (ACE_HAS_EXCEPTIONS)
-     // See /opt/SUNWspro_5.0/SC5.0/include/CC/stdcomp.h:
-#    define _RWSTD_NO_EXCEPTIONS 1
-#  endif /* ! ACE_HAS_EXCEPTIONS */
 # endif /* __SUNPRO_CC >= 0x500 */
 # endif /* __SUNPRO_CC >= 0x420 */
 
@@ -60,12 +55,13 @@
   // default.  It can be enabled by adding "exceptions=1" to the "make"
   // invocation.  See include/makeinclude/platform_sunos5_sunc++.GNU
   // for details.
+  // #define ACE_HAS_EXCEPTIONS
 
 #  if defined (ACE_HAS_EXCEPTIONS)
      // If exceptions are enabled and we are using Sun/CC then
      // <operator new> throws an exception instead of returning 0.
 #    define ACE_NEW_THROWS_EXCEPTIONS
-#  endif /* ACE_HAS_EXCEPTIONS */
+#  endif /* ACE_NEW_THROWS_EXCEPTIONS */
 
     /* If you want to disable threading with Sun CC, remove -mt
        from your CFLAGS, e.g., using make threads=0. */
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/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 dadbed2b835..4a34c083dda 100644
--- a/apps/Gateway/Gateway/Makefile
+++ b/apps/Gateway/Gateway/Makefile
@@ -25,8 +25,7 @@ FILES	= Concrete_Connection_Handlers \
 
 LSRC	= $(addsuffix .cpp,$(FILES))
 LDLIBS	= -lGateway
-
-LIBS   += $(ACELIB)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BUILD 	= $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
 
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/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 bc08ea314fc..91228a06baa 100644
--- a/apps/Gateway/Peer/Makefile
+++ b/apps/Gateway/Peer/Makefile
@@ -17,7 +17,7 @@ FILES	= Options \
 
 LSRC	= $(addsuffix .cpp,$(FILES))
 LDLIBS	= -lPeer
-LIBS   += $(ACELIB)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BUILD 	= $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
 
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/bin/ACEutils.pm b/bin/ACEutils.pm
index 50bb743f15f..2f7347c73b6 100644
--- a/bin/ACEutils.pm
+++ b/bin/ACEutils.pm
@@ -39,19 +39,6 @@ sub waitforfile
   sleep 1 while (!(-e $file));
 }
 
-sub waitforfile_timed
-{
-  my $file = shift;
-  my $maxtime = shift;
-  while ($maxtime-- != 0) {
-    if (-e $file) {
-      return 0;
-    }
-    sleep 1;
-  }
-  return -1;
-}
-
 $sleeptime = 5;
 
-1;
+1;
\ No newline at end of file
diff --git a/bin/Process_Unix.pm b/bin/Process_Unix.pm
index 11463630bbf..a4ad894f470 100644
--- a/bin/Process_Unix.pm
+++ b/bin/Process_Unix.pm
@@ -3,8 +3,6 @@ package Process;
 
 $EXE_EXT = "";
 
-use POSIX "sys_wait_h";
-
 sub Create
 {
   my $name = shift;
@@ -22,7 +20,7 @@ sub Create
     {
       #child here
       exec $name." ".$args;
-      die "ERROR: exec failed for <$name> <$args>";
+      die "exec failed for <$name> <$args>";
     }
     elsif ($! =~ /No more process/)
     {
@@ -33,22 +31,15 @@ sub Create
     else 
     {
       # weird fork error
-      print STDERR "ERROR: Can't fork: $!\n";
+      die "Can't fork: $!\n";
     }
   }
 }
 
-sub Terminate
-{
-  my $self = shift;
-  kill ('TERM', $self->[0]);
-  # print STDERR "Process_Unix::Kill 'TERM' $self->[0]\n";
-}
-
 sub Kill
 {
   my $self = shift;
-  kill ('KILL', $self->[0]);
+  kill ('TERM', $self->[0]);
   # print STDERR "Process_Unix::Kill 'TERM' $self->[0]\n";
 }
 
@@ -58,18 +49,5 @@ sub Wait
   waitpid ($self->[0], 0);
 }
 
-sub TimedWait
-{
-  my $self = shift;
-  my $maxtime = shift;
-  while ($maxtime-- != 0) {
-    my $pid = waitpid ($self->[0], &WNOHANG);
-    if ($pid != 0 && $? != -1) {
-      return $?;
-    }
-    sleep 1;
-  }
-  return -1;
-}
 
 1;
diff --git a/bin/Process_Win32.pm b/bin/Process_Win32.pm
index ad1197329d4..400d778c6e4 100644
--- a/bin/Process_Win32.pm
+++ b/bin/Process_Win32.pm
@@ -35,26 +35,10 @@ sub Kill
   Win32::Process::Kill ($self->[0], -1);
 }
 
-sub Terminate
-{
-  my $self = shift;
-  Win32::Process::Kill ($self->[0], -1);
-}
-
 sub Wait
 {
   my $self = shift;
   Win32::Process::Wait ($self->[0], INFINITE);
 }
 
-sub TimedWait
-{
-  my $self = shift;
-  my $maxtime = shift;
-  Win32::Process::Wait ($self->[0], $maxtime);
-  # @@ TODO figure out if we exit because of a timeout and return -1
-  # in that case.
-  return 0;
-}
-
-1;
+1;
\ No newline at end of file
diff --git a/bin/README.html b/bin/README.html
index 8deb59d4462..87a4ab311cb 100644
--- a/bin/README.html
+++ b/bin/README.html
@@ -1,8 +1,7 @@
-<!-- $Id$ -->
 <HTML>
 
 <HEAD>
-<TITLE>ACE Documentation Tools</TITLE>
+<TITLE>ACE OSE Tools</TITLE>
 
 <BODY text = "#000000"
 link="#000fff"
@@ -10,32 +9,23 @@ vlink="#ff0f0f"
 bgcolor="#ffffff">
 
 <HR>
-<H3>ACE Documentation Tools</H3>
+<H3>Modified Version of the OSE Documentation Tools</H3>
 
 This <A HREF="http://www.cs.wustl.edu/~schmidt/ACE-bin/">directory</A>
 contains versions of the freely available <A
-HREF="http://www.dscpl.com.au/">OSE</A> tools used to generate the ACE
-<A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/man/man3/">man</A>
-and <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/man/acewindex.html">HTML</A>
-documentation.  These tools were originally written by <A
-HREF="mailto:grahamd@nms.otc.com.au"> Graham Dumpleton</A> and later
-modified by <A HREF="mailto:kdorn@erlh.siemens.de">Karlheinz Dorn</A>.
-<A HREF="http://www.cs.wustl.edu/~schmidt/ACE-members.html">We</A> are
-very grateful to Graham and Karlheinz for these tools.  You can obtain
-the ACE documentation-generation tools in the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE-obtain.html">ACE</A>
+HREF="http://www.dscpl.com.au/">OSE</A> tools modified by <A
+HREF="mailto:kdorn@erlh.siemens.de">Karlheinz Dorn</A>, which were
+originally written by <A HREF="mailto:grahamd@nms.otc.com.au"> Graham
+Dumpleton</A> I (<A HREF="http://www.cs.wustl.edu/~schmidt">Doug
+Schmidt</a>) am very grateful to Graham and Karlheinz for these tools.
+You can obtain these files via the <A HREF="ACE-obtain.html">ACE</A>
 release. <P>
 
-<H3>Modified Version of the OSE Documentation Tools</H3>
-
-The primary goal of Karlheinz's modifications was to create a
-<EM>class</EM>.hxx and <EM>class</EM>.cxx file (for each class,
-struct, union included within the original ACE header file) from the
-ACE *.h header files by collecting the comments from that file and
-feeding them into the newly created files, but keeping the ACE *.h
-file untouched. <P>
+The primary goal of the modifications was to create a <EM>class</EM>.hxx and
+<EM>class</EM>.cxx file (for each class, struct, union included within the
+original ACE header file) from the ACE *.h header files by collecting
+the comments from that file and feeding them into the newly created
+files, but keeping the ACE *.h file untouched. <P>
 
 This helps when making product documentation using commercial
 documentation tools (e.g., <A HREF="http://www.k2.co.uk">George</A>,
@@ -46,14 +36,12 @@ layout.  The modifications are an upgrade to the original OSE-tools,
 but many bug-fixes are also done for the OSE-tool files (some are
 listed below). <P>
 
-Incidentally, the classinfo tools in OSE have evolved independently
+Incidentally, the Classinfo tools in OSE have evolved independently
 since the copies in ACE were made and they support new features not
 supported in the ACE version of the tools.  Certain subtle changes
 were also made in the ACE copies for indicating sections,
-<em>etc.</em>, which makes them different from the OSE documentation.
-For more information please contact <A
-HREF="mailto:grahamd@nms.otc.com.au">Graham Dumpleton</A>, who heads
-the <A HREF="http://www.dscpl.com.au/">OSE</A> project. <P>
+<em>etc.</em>, which makes them different from the OSE
+documentation. <P>
 
 Karlheinz's extensions make it easy to include new ACE versions into
 commercial documentations without doing any painful modifications of
@@ -159,13 +147,12 @@ CORRECT: <P>
 Other documentation tools are available at the following URLs: <P>
 
 <UL>
-<A HREF="http://www.dscpl.com.au/">OSE documentation tools</A>
-<LI> <A HREF="http://www.zib.de/Vishal/software/doc++/index.html">doc++</a>
+<LI> <A HREF="http://www.ZIB-Berlin.DE/VisPar/doc++/doc++.html">doc++</a> <P>
 <LI> <A HREF="http://www.k2.co.uk">George</A>
 </UL>
 
 <P><HR><P>
-Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</A> home page.
+Back to the <A HREF="ACE.html">ACE</A> home page.
 
 </BODY> 
 </HTML>
diff --git a/bin/auto_compile b/bin/auto_compile
index cce6eadddcb..054476f45a2 100755
--- a/bin/auto_compile
+++ b/bin/auto_compile
@@ -40,12 +40,7 @@ $MODULE='ACE_wrappers';
      'netsvcs',
      'tests',
      'apps/gperf',
-     'TAO/tao',
-     'TAO/TAO_IDL',
-     'TAO/orbsvcs',
-     'TAO/tests',
-     'TAO/examples/POA',
-     'TAO/performance-tests');
+     'TAO');
 
 # This are the pairs "sub-directory , script" we run; the separator
 # *must* be a space followed by a comma and then another space.
@@ -55,31 +50,11 @@ $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/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',
-      'TAO/examples/POA/Explicit_Activation , run_test.pl',
-#      'TAO/examples/POA/FindPOA , run_test.pl',
-      'TAO/examples/POA/Forwarding , run_test.pl',
-      'TAO/examples/POA/NewPOA , run_test.pl',
-      'TAO/examples/POA/On_Demand_Activation , run_test.pl',
-      'TAO/examples/POA/On_Demand_Loading , run_test.pl',
-      'TAO/examples/POA/Reference_Counted_Servant , run_test.pl',
-      'TAO/examples/POA/Loader , run_test.pl',
-      'TAO/examples/POA/RootPOA , RootPOA',
-      'TAO/examples/POA/Identity , Identity',
-      'TAO/examples/POA/Adapter_Activator , run_test.pl',
       'TAO/tests/MT_Client , run_test.pl',
-      'TAO/tests/NestedUpcall/Reactor , run_test.pl',
-      'TAO/performance-tests/Cubit/TAO/MT_Cubit , run_test.pl -n 100'
-#      'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane',
-#      'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane_ir',
-#      'TAO/orbsvcs/tests/Property , run_test.pl'
-    );
-
+      'TAO/orbsvcs/tests/Simple_Naming , 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$';
@@ -209,7 +184,6 @@ $ENV{'TAO_ROOT'} = $CHECKOUT . '/' . $MODULE . '/build/' . $BUILD . '/TAO';
 $MAKEFLAGS .= " shared_libs_only=1";
 foreach $i (@BUILD_LIST) {
     $date = localtime;
-    print LOG "$CMD: =============================================\n";
     print LOG "$CMD: make for $i started at ", $date, "\n";
     open(MAKE, "make -k $MAKEFLAGS -C $i 2>&1 |")
 	|| mydie "cannot start make for $i";
@@ -243,7 +217,6 @@ foreach $i (@BUILD_LIST) {
     }
     $date = localtime;
     print LOG "$CMD: make for $i finished at ", $date, "\n";
-    print LOG "$CMD: =============================================\n\n";
 }
 
 foreach $i (@RUN_LIST) {
@@ -252,7 +225,6 @@ foreach $i (@RUN_LIST) {
     local $program = $test_info[1];
 
     $date = localtime;
-    print LOG "$CMD: =============================================\n";
     print LOG "$CMD: running $program in $directory at ", $date, "\n";
     local $subdir =
 	$CHECKOUT .'/'. $MODULE .'/build/'. $BUILD .'/'. $directory;
@@ -266,12 +238,12 @@ foreach $i (@RUN_LIST) {
     }
     while (<RUN>) {
 	print LOG $_;
-	if (m/^Error/ || m/FAILED/ || m/EXCEPTION/) {
+	if (m/^Error/ || m/FAILED/) {
 	    $run_error = 1;
 	}
     }
     if (close(RUN) == 0) {
-	push @failures, "Error when closing pipe for $program in $directory";
+	push @failures, "cannot finish $program in $directory";
 	next;
     }
     $date = localtime;
diff --git a/bin/create_ace_build b/bin/create_ace_build
index 965101b9865..b42d07b4673 100755
--- a/bin/create_ace_build
+++ b/bin/create_ace_build
@@ -65,7 +65,7 @@ while ($#ARGV >= 0  &&  $ARGV[0] =~ /^-/) {
         $verbose = 1;
     } elsif ($ARGV[0] eq '-d') {
         if ($ARGV[1] =~ /^\d+$/) {
-            $directory_mode = eval ($ARGV[1]); shift;
+            $directory_mode = $ARGV[1]; shift;
         } else {
             warn "$0:  must provide argument for -d option\n";
             die $usage;
diff --git a/docs/ACE-categories.html b/docs/ACE-categories.html
index a728ecd9518..d729b9e40d7 100644
--- a/docs/ACE-categories.html
+++ b/docs/ACE-categories.html
@@ -94,6 +94,7 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Sched_Params.i">Sched_Params.i</a></li>
 <li><a href = "../ace/Synch.cpp">Synch.cpp</a></li>
 <li><a href = "../ace/Synch.h">Synch.h</a></li>
+<b><a href = "../man/html/ACE_Synch.html">[man page]</a></b>
 <li><a href = "../ace/Synch.i">Synch.i</a></li>
 <li><a href = "../ace/Synch_Options.cpp">Synch_Options.cpp</a></li>
 <li><a href = "../ace/Synch_Options.h">Synch_Options.h</a></li>
@@ -101,6 +102,7 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Synch_Options.i">Synch_Options.i</a></li>
 <li><a href = "../ace/Synch_T.cpp">Synch_T.cpp</a></li>
 <li><a href = "../ace/Synch_T.h">Synch_T.h</a></li>
+<b><a href = "../man/html/ACE_Synch_T.html">[man page]</a></b>
 <li><a href = "../ace/Synch_T.i">Synch_T.i</a></li>
 <li><a href = "../ace/Thread.cpp">Thread.cpp</a></li>
 <li><a href = "../ace/Thread.h">Thread.h</a></li>
@@ -382,6 +384,8 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/IOStream.cpp">IOStream.cpp</a></li>
 <li><a href = "../ace/IOStream.h">IOStream.h</a></li>
 <b><a href = "../man/html/ACE_IOStream.html">[man page]</a></b>
+<li><a href = "../ace/IOStream_T.cpp">IOStream_T.cpp</a></li>
+<li><a href = "../ace/IOStream_T.h">IOStream_T.h</a></li>
 <b><a href = "../man/html/ACE_IOStream_T.html">[man page]</a></b>
 <li><a href = "../ace/IOStream_T.i">IOStream_T.i</a></li>
 <li><a href = "../ace/Pipe.cpp">Pipe.cpp</a></li>
@@ -554,10 +558,12 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Reactor.h">Reactor.h</a></li>
 <b><a href = "../man/html/ACE_Reactor.html">[man page]</a></b>
 <li><a href = "../ace/Reactor.i">Reactor.i</a></li>
+<b><a href = "../man/html/ACE_ReactorEx.html">[man page]</a></b>
 <li><a href = "../ace/Reactor_Impl.h">Reactor_Impl.h</a></li>
 <b><a href = "../man/html/ACE_Reactor_Impl.html">[man page]</a></b>
 <li><a href = "../ace/Select_Reactor.cpp">Select_Reactor.cpp</a></li>
 <li><a href = "../ace/Select_Reactor.h">Select_Reactor.h</a></li>
+<b><a href = "../man/html/ACE_Select_Reactor.html">[man page]</a></b>
 <li><a href = "../ace/Select_Reactor.i">Select_Reactor.i</a></li>
 <li><a href = "../ace/WFMO_Reactor.cpp">WFMO_Reactor.cpp</a></li>
 <li><a href = "../ace/WFMO_Reactor.h">WFMO_Reactor.h</a></li>
@@ -706,16 +712,19 @@ li>
 <b><a href = "../man/html/ACE_Timer_Hash_T.html">[man page]</a></b>
 <li><a href = "../ace/Timer_Heap.cpp">Timer_Heap.cpp</a></li>
 <li><a href = "../ace/Timer_Heap.h">Timer_Heap.h</a></li>
+<b><a href = "../man/html/ACE_Timer_Heap.html">[man page]</a></b>
 <li><a href = "../ace/Timer_Heap_T.cpp">Timer_Heap_T.cpp</a></li>
 <li><a href = "../ace/Timer_Heap_T.h">Timer_Heap_T.h</a></li>
 <b><a href = "../man/html/ACE_Timer_Heap_T.html">[man page]</a></b>
 <li><a href = "../ace/Timer_List.cpp">Timer_List.cpp</a></li>
 <li><a href = "../ace/Timer_List.h">Timer_List.h</a></li>
+<b><a href = "../man/html/ACE_Timer_List.html">[man page]</a></b>
 <li><a href = "../ace/Timer_List_T.cpp">Timer_List_T.cpp</a></li>
 <li><a href = "../ace/Timer_List_T.h">Timer_List_T.h</a></li>
 <b><a href = "../man/html/ACE_Timer_List_T.html">[man page]</a></b>
 <li><a href = "../ace/Timer_Queue.cpp">Timer_Queue.cpp</a></li>
 <li><a href = "../ace/Timer_Queue.h">Timer_Queue.h</a></li>
+<b><a href = "../man/html/ACE_Timer_Queue.html">[man page]</a></b>
 <li><a href = "../ace/Timer_Queue.i">Timer_Queue.i</a></li>
 <li><a href = "../ace/Timer_Queue_Adapters.cpp">Timer_Queue_Adapters.cpp</a></li>
 <li><a href = "../ace/Timer_Queue_Adapters.h">Timer_Queue_Adapters.h</a></li>
diff --git a/docs/ACE-guidelines.html b/docs/ACE-guidelines.html
index 12f0f073311..af3ac12dd4b 100644
--- a/docs/ACE-guidelines.html
+++ b/docs/ACE-guidelines.html
@@ -6,13 +6,13 @@
     <link rev=made href="mailto:levine@cs.wustl.edu">
   </head>
 
-<body text = "#000000"
+<BODY text = "#000000"
 link="#000fff"
 vlink="#ff0f0f"
 bgcolor="#ffffff">
 
 <hr>
-<h3>ACE Software Development Guidelines</h3>
+  <h3>ACE Software Development Guidelines</h3>
 
 <ul>
   <li><strong>General</strong><p>
@@ -82,10 +82,6 @@ bgcolor="#ffffff">
         unless absolutely necessary.  Not all ACE platforms support them.
         Therefore, wherever they are used, ACE_LACKS_FLOATING_POINT
         conditional code must be also be used.<p>
-
-    <li>Avoid including the string ``Error'' in a source code filename.
-        GNU Make's error messages start with ``Error''.  So, it's much
-        easier to search for errors if filenames don't contain ``Error''.<p>
   </ul>
 
   <li><strong>Code Documentation</strong><p>
@@ -230,8 +226,8 @@ bgcolor="#ffffff">
         <code>#endif</code> for the optimization to be effective and
         correct.<p>
 
-    <li><p>Files that contain parametric classes should follow this style:
-      <pre>
+    <li><P>Files that contain parametric classes should follow this style:
+      <PRE>
       #ifndef FOO_T_H
       #define FOO_T_H
 
@@ -255,14 +251,14 @@ bgcolor="#ffffff">
       #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
       #endif /* FOO_T_H */
-</pre></p>
-      <p>
+</PRE></P>
+      <P>
       Notice that some compilers need to see the code of the template,
-      hence the <code>.cpp</code> file must be included from the
+      hence the <CODE>.cpp</CODE> file must be included from the
       header file.
-      </p>
-      <p>
-      To avoid multiple inclusions of the <code>.cpp</code> file it
+      </P>
+      <P>
+      To avoid multiple inclusions of the <CODE>.cpp</CODE> file it
       should also be protected as in:
       <pre>
       #ifndef FOO_T_C
@@ -283,12 +279,13 @@ bgcolor="#ffffff">
 
       #endif /* FOO_T_H */
 </pre></p>
-      <p>Finally, you may want to include the template header file from a
+      <P>
+      Finally you may want to include the template header file from a
       non-template header file (check
-      <code>$ACE_ROOT/ace/Synch.h</code>); in such a case the template
+      <CODE>$ACE_ROOT/ace/Synch.h</CODE>); in such a case the template
       header should be included <strong>after</strong> the inline
-      function definitions, as in:</p>
-      <p><pre>
+      function definitions, as in:</P>
+      <P><PRE>
       #ifndef FOO_H
       #define FOO_H
 
@@ -306,13 +303,8 @@ bgcolor="#ffffff">
       #include "Foo_T.h"
 
       #endif /* FOO_H */
-</pre></p>
+</PRE></P>
     </li>
-
-    <li>Avoid <code>#include &lt;math.h&gt;</code> if at all possible.
-      The <code>/usr/include/math.h</code> on SunOS 5.5.1 through 5.7
-      defines a struct name <strong>exception</strong>, which complicates
-      use of exceptions.<p>
   </ul>
 
   <li><strong>C++ Syntax and Constructs</strong><p>
@@ -593,10 +585,12 @@ bgcolor="#ffffff">
     <li>Functions should always return -1 to indicate failure, and
         0 or greater to indicate success.<p>
 
-    <li>Separate the code of your templates from the code for
+    <li><P>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>
+        template and non-template code is mixed in the same file.
+      </P>
     </li>
+
   </ul>
 
   <li><strong>I/O</strong><p>
@@ -774,15 +768,18 @@ bgcolor="#ffffff">
       </ul><p>
 
   <li><strong>Compilation</strong><p>
+
   <ul>
-    <li>Whenever you add a new test or example to ACE or TAO, make
-        sure that you modify the Makefile or project file in the
-        parent directory.  This will make sure that your code gets
-        compiled on a regular basis.  In some cases, this also applies
-        to MSVC project files.<p>
-  </ul><p>
-</ul>
 
+    <li> Whenever you add a new test or example to ACE or TAO, make
+         sure that you modify the makefile or project file in the
+         parent directory.  This will make sure that your code gets
+         compiled on a regular basis. In some cases, this also applies
+         to MSVC project files. <p>
+
+      </ul><p>
+
+</ul>
 
 <hr>
 <h3><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">ACE</a>
@@ -1005,7 +1002,7 @@ bgcolor="#ffffff">
   Design Rules</a></h3>
 
 
-<hr><p>
+<hr> <P>
   <font size=-1>
     Last modified <!--#echo var="LAST_MODIFIED" -->.<p>
   </font>
diff --git a/docs/ACE-lessons.html b/docs/ACE-lessons.html
index f3d85674e4d..64c8db551ef 100644
--- a/docs/ACE-lessons.html
+++ b/docs/ACE-lessons.html
@@ -98,9 +98,8 @@ Over the past decade, I've worked with many companies (including
 Motorola Iridium, Ericsson, Siemens, Bellcore, Kodak, and McDonnell
 Douglas) building reusable OO communication software [Schmidt:96].  In
 these projects, we've applied a range of OO middleware tools including
-OMG <A HREF="http://www.cs.wustl.edu/~schmidt/corba.html">CORBA</A>
-(an emerging industry standard for distributed object computing) and
-the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</A>
+OMG <A HREF="corba.html">CORBA</A> (an emerging industry standard for
+distributed object computing) and the <A HREF="ACE.html">ACE</A>
 framework (a widely used C++ framework that implements many strategic
 and tactical design patterns for concurrent communication software).
 The following are lessons learned from developing and deploying
diff --git a/docs/ACE-porting.html b/docs/ACE-porting.html
index 5b3a7f590b8..47ae7c3b577 100644
--- a/docs/ACE-porting.html
+++ b/docs/ACE-porting.html
@@ -178,7 +178,7 @@ take advantage of if a compiler supports them:
 <P><HR><P>
 
 Back to the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE-documentation.html">ACE
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-documentation.html">ACE
 documentation</A> page.
 
 <!--#include virtual="/~schmidt/cgi-sig.html" -->
diff --git a/docs/ACE-subsets.html b/docs/ACE-subsets.html
index 6c79cc09f75..3a7515b8a47 100644
--- a/docs/ACE-subsets.html
+++ b/docs/ACE-subsets.html
@@ -458,7 +458,7 @@ Please let us know if you're able to contribute to this effort.<p>
 
 Here is an example size breakdown, by ACE library component.  It is
 for ACE 4.6.25, statically built with these <a
-href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html#flags">make flags</a>:
+href="../ACE-INSTALL.html#flags">make flags</a>:
 
 <pre><code>
     debug=0 optimize=1 static_libs_only=1 DEFFLAGS=-DACE_USE_RCSID=0
diff --git a/docs/tutorials/Chap_2/ex04.html b/docs/tutorials/Chap_2/ex04.html
index 16007f9c8f1..41cf78188bd 100644
--- a/docs/tutorials/Chap_2/ex04.html
+++ b/docs/tutorials/Chap_2/ex04.html
@@ -82,6 +82,6 @@ sent wait for a reply from</FONT>
 <BR>client.send_data();
 <BR>}
 <BR>&nbsp;
-<BR>&nbsp;<A HREF="ex05.html">Next Example</A>
+<BR>&nbsp;<A HREF="ex05.htm">Next Example</A>
 </BODY>
 </HTML>
diff --git a/docs/tutorials/Chap_2/ex05.html b/docs/tutorials/Chap_2/ex05.html
deleted file mode 100644
index 1a88e7c8dbd..00000000000
--- a/docs/tutorials/Chap_2/ex05.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="Author" CONTENT="Ambreen Ilyas">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.05 [en] (X11; I; SunOS 5.5.1 sun4u) [Netscape]">
-   <TITLE>Example 5</TITLE>
-</HEAD>
-<BODY>
-<FONT COLOR="#CC0000">/////////////////////////////////////////////////////////////////////////////////////////////////////////////////</FONT>
-<BR><FONT COLOR="#CC0000">//// This example is from the ACE Programmers
-Guide.</FONT>
-<BR><FONT COLOR="#CC0000">////&nbsp; Chapter: "IPC SAP" (Interprocess Communication
-Mechanisms in ACE).</FONT>
-<BR><FONT COLOR="#CC0000">//// For details please see the guide at</FONT>
-<BR><FONT COLOR="#CC0000">//// http://www.cs.wustl.edu/~schmidt/ACE.html</FONT>
-<BR><FONT COLOR="#CC0000">////&nbsp; AUTHOR: Umar Syyid (usyyid@hns.com)</FONT>
-<BR><FONT COLOR="#CC0000">//// and Ambreen Ilyas (ambreen@bitsmart.com)</FONT>
-<BR><FONT COLOR="#CC0000">/////////////////////////////////////////////////////////////////////////////////////////////////////////////</FONT>
-
-<P><FONT COLOR="#CC0000">//Example 5</FONT>
-<BR><FONT COLOR="#000099">#include</FONT> <FONT COLOR="#006600">"ace/SOCK_Dgram_Mcast.h"</FONT>
-<BR><FONT COLOR="#000099">#include</FONT> <FONT COLOR="#006600">"ace/OS.h"</FONT>
-<BR><FONT COLOR="#000099">#define</FONT> <FONT COLOR="#663366">DEFAULT_MULTICAST_ADDR
-"224.9.9.2"</FONT>
-<BR><FONT COLOR="#000099">#define</FONT> <FONT COLOR="#663366">TIMEOUT
-5</FONT>
-
-<P>class Reciever_Multicast{
-
-<P>public:
-<BR>Reciever_Multicast(int port):
-<BR>&nbsp;mcast_addr_(port,DEFAULT_MULTICAST_ADDR),remote_addr_((u_short)0){
-<BR>&nbsp;<FONT COLOR="#FF0000"> // Subscribe to multicast address.</FONT>
-<BR>&nbsp; if (mcast_dgram_.subscribe (mcast_addr_) == -1){
-<BR>&nbsp;ACE_DEBUG((LM_DEBUG,"Error in subscribing to Multicast address
-\n"));
-<BR>&nbsp;exit(-1);
-<BR>&nbsp;}
-<BR>}
-
-<P>~Reciever_Multicast(){
-<BR>&nbsp;if(mcast_dgram_.unsubscribe()==-1)
-<BR>&nbsp; ACE_DEBUG((LM_ERROR,?Error in unsubscribing from Mcast group\n?));
-<BR>&nbsp;}
-<BR>&nbsp;
-<BR>&nbsp;
-<BR>&nbsp;
-
-<P><FONT COLOR="#FF0000">//Receive data from someone who is sending data
-on the multicast group</FONT>
-<BR><FONT COLOR="#FF0000">//address to do so it must use the multicast
-datagram component</FONT>
-<BR><FONT COLOR="#FF0000">//mcast_dgram_.</FONT>
-<BR>int recv_multicast(){
-<BR><FONT COLOR="#FF0000">&nbsp;//get ready to recieve data from the sender.</FONT>
-<BR>&nbsp;if(mcast_dgram_.recv
-<BR>&nbsp;&nbsp;&nbsp; (&amp;mcast_info,sizeof (mcast_info),remote_addr_)==-1)
-<BR>&nbsp;&nbsp;&nbsp; return -1;
-<BR>&nbsp;ACE_DEBUG ((LM_DEBUG, "(%P|%t) Received multicast from %s:%d.\n",
-<BR>&nbsp;remote_addr_.get_host_name(), remote_addr_.get_port_number()));
-<BR>&nbsp;ACE_DEBUG((LM_DEBUG,"Successfully receieved %d\n", mcast_info));
-<BR>&nbsp;return 0;
-<BR>&nbsp; }
-
-<P>private:
-<BR>&nbsp;ACE_INET_Addr mcast_addr_;
-<BR>&nbsp;ACE_INET_Addr remote_addr_;
-<BR>&nbsp;ACE_SOCK_Dgram_Mcast mcast_dgram_;
-<BR>&nbsp;int mcast_info;
-<BR>};
-<BR>&nbsp;
-<BR>&nbsp;
-<BR>int main(int argc, char*argv[]){
-<BR>&nbsp;Reciever_Multicast m(2000);
-<BR>&nbsp;<FONT COLOR="#FF0000">//Will run forever</FONT>
-<BR>&nbsp;while(m.recv_multicast()!=-1) {
-<BR>&nbsp; ACE_DEBUG((LM_DEBUG,"Multicaster succesful \n"));
-<BR>&nbsp;}
-<BR>&nbsp;
-<BR>&nbsp;ACE_DEBUG((LM_ERROR,"Multicaster failed \n"));
-<BR>&nbsp;exit(-1);
-<BR>}
-
-<P>&nbsp;<A HREF="ex06.html">Next Example</A>
-<BR>&nbsp;
-</BODY>
-</HTML>
diff --git a/etc/Svc_Conf_y.cpp.diff b/etc/Svc_Conf_y.cpp.diff
index b8310e87bb3..d0ec392dd63 100644
--- a/etc/Svc_Conf_y.cpp.diff
+++ b/etc/Svc_Conf_y.cpp.diff
@@ -4,8 +4,8 @@
  #endif /* ACE_YYDEBUG_INDENT */
  #ifndef ACE_YYDEBUG_REDUCE
  #ifdef __cplusplus
--void ACE_YYDEBUG_REDUCE(int ace_yynew_state, int ace_yyrule_num, const char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
-+void ACE_YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, const char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
+-void ACE_YYDEBUG_REDUCE(int ace_yynew_state, int ace_yyrule_num, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
++void ACE_YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count)
  #else
  ACE_YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count)
  int ace_yynew_state;
@@ -13,8 +13,8 @@
  #endif /* ACE_YYDEBUG_REDUCE */
  #ifndef ACE_YYDEBUG_SHIFT_LEXEME
  #ifdef __cplusplus
--void ACE_YYDEBUG_SHIFT_LEXEME(int ace_yyold_state, int ace_yynew_state, const char *ace_yytoken_string, int ace_yynew_indent)
-+void ACE_YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state*/, const char *ace_yytoken_string, int ace_yynew_indent)
+-void ACE_YYDEBUG_SHIFT_LEXEME(int ace_yyold_state, int ace_yynew_state, char *ace_yytoken_string, int ace_yynew_indent)
++void ACE_YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state*/, char *ace_yytoken_string, int ace_yynew_indent)
  #else
  ACE_YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent)
  int ace_yyold_state;
@@ -22,8 +22,8 @@
  #endif /*  ACE_YYDEBUG_SHIFT_LEXEME */
  #ifndef ACE_YYDEBUG_LOOK_AHEAD
  #ifdef __cplusplus
--void ACE_YYDEBUG_LOOK_AHEAD(int ace_yynew_state, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent)
-+void ACE_YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent)
+-void ACE_YYDEBUG_LOOK_AHEAD(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
++void ACE_YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
  #else
  ACE_YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
  int ace_yynew_state;
@@ -40,8 +40,8 @@
  #endif /* ACE_YYDEBUG_DISCARD_STATE */
  #ifndef ACE_YYDEBUG_DISCARD_TOKEN
  #ifdef __cplusplus
--void ACE_YYDEBUG_DISCARD_TOKEN(int ace_yynew_state, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent)
-+void ACE_YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, const char *ace_yytoken_string, int ace_yyindent)
+-void ACE_YYDEBUG_DISCARD_TOKEN(int ace_yynew_state, int ace_yytoken_num, char *ace_yytoken_string, int ace_yyindent)
++void ACE_YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, char *ace_yytoken_string, int ace_yyindent)
  #else
  ACE_YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
  int ace_yynew_state;
diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile
index 3ec23a27930..e8d835ee4d6 100644
--- a/examples/ASX/CCM_App/Makefile
+++ b/examples/ASX/CCM_App/Makefile
@@ -19,8 +19,6 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 LOBJ	= $(addsuffix .o,$(FILES))
 SHOBJ	= $(addsuffix .so,$(FILES))
 
-LIBS   += $(ACELIB)
-
 BUILD   = $(VBIN)
 
 #----------------------------------------------------------------------------
diff --git a/examples/Connection/misc/Connection_Handler.cpp b/examples/Connection/misc/Connection_Handler.cpp
index af2efb2ed5f..13c58a1c629 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 (((unsigned int) buf[0]) == EOF)
+      if (((int) buf[0]) == EOF)
 	ACE_ERROR_RETURN ((LM_ERROR,
 			   "(%P|%t) closing log daemon (fd = %d)\n",
                            this->get_handle ()),
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/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile
index e23cf3d9b1d..ad9b434c583 100644
--- a/examples/Service_Configurator/IPC-tests/server/Makefile
+++ b/examples/Service_Configurator/IPC-tests/server/Makefile
@@ -27,8 +27,7 @@ FILES	= Handle_L_Dgram \
 PSRC   	= $(addsuffix .cpp,$(BIN))
 LSRC	= $(addsuffix .cpp,$(FILES))
  
-LDLIBS += -lServer
-LIBS   += $(ACELIB)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BUILD	= $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) 
 
diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile
index 68bd6b66f4a..26a5e9f2116 100644
--- a/examples/Service_Configurator/Misc/Makefile
+++ b/examples/Service_Configurator/Misc/Makefile
@@ -20,7 +20,7 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 
 LDLIBS 	= -lTimer
 
-LIBS   += $(ACELIB)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BUILD	= $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) 
 
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/Threads/task_five.cpp b/examples/Threads/task_five.cpp
index 479be53deac..b8d4847d9f1 100644
--- a/examples/Threads/task_five.cpp
+++ b/examples/Threads/task_five.cpp
@@ -1,45 +1,31 @@
 // $Id$
 
-// ============================================================================
+// Stress testing thread creation and thread cancellation using
+// ACE_Task.
 //
-// = LIBRARY
-//    examples/Threads/
-//
-// = FILENAME
-//    task_five.cpp
-//
-// = DESCRIPTION
-//   Stress testing thread creation and thread cancellation using
-//   ACE_Task.
-//
-// = AUTHOR
-//    Author: Detlef Becker <Detlef.Becker@med.siemens.de>
-//
-// ============================================================================
-
+// Author: Detlef Becker <Detlef.Becker@med.siemens.de>
 
+#include "ace/Service_Config.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Task.h"
 
 ACE_RCSID(Threads, task_five, "$Id$")
 
-static const int DEFAULT_TASKS = 100;
-static const int DEFAULT_ITERATIONS = 10;
-
-// Default stack size
-static size_t default_stack_size =      
+static const int DEFAULT_TASKS = 1000;
+static size_t default_stack_size =      // Default stack size
 #if defined (ACE_WIN32)
     0;
 #else
     8192;
-#endif /* ACE_WIN32 */
+#endif
+
   u_int loop_count = 0;
   u_int error_count = 0;
 
 class Test_Task : public ACE_Task<ACE_SYNCH>
 {
 public:
-  Test_Task (ACE_Thread_Manager * = ACE_Thread_Manager::instance ());
+  Test_Task (ACE_Thread_Manager *thrmgr = ACE_Service_Config::thr_mgr ());
   ~Test_Task (void) {};
 
   int open (void * = 0);
@@ -97,27 +83,19 @@ Test_Task::synch (void)
   return thr_mgr_->wait_grp (grp_id_);
 }
 
-static void 
-work (ACE_Thread_Manager *thr_mgr,
-      int n_tasks,
-      size_t stack_size)
+void work (ACE_Thread_Manager *thr_mgr, int n_tasks, size_t stack_size)
 {
   ACE_UNUSED_ARG (stack_size);
 
   int i;
-  Test_Task *task_array;
-
-  ACE_NEW (task_array,
-           Test_Task[n_tasks]);
+  Test_Task *task_array = new Test_Task[n_tasks];
 
   ACE_DEBUG ((LM_DEBUG,
               "Opening Tasks, loop count = %d, error count = %d\n",
               loop_count,
               error_count));
 
-  for (i = 0;
-       i < n_tasks;
-       i++)
+  for (i = 0; i < n_tasks; i++)
     task_array[i].open ();
 
   ACE_OS::sleep (1);
@@ -135,9 +113,7 @@ work (ACE_Thread_Manager *thr_mgr,
               loop_count,
               error_count));
 
-  for (i = 0;
-
-       i < n_tasks; i++)
+  for (i = 0; i < n_tasks; i++)
     if (-1 == task_array[i].synch ())
       {
         ACE_ERROR ((LM_ERROR,
@@ -164,12 +140,10 @@ main (int argc, char *argv[])
 {
   size_t stack_size = argc > 1 ? ACE_OS::atoi (argv[1]) : default_stack_size;
   const int n_tasks = argc > 2 ? ACE_OS::atoi (argv[2]) : DEFAULT_TASKS;
-  u_int iterations = argc > 3 ? ACE_OS::atoi (argv[3]) : DEFAULT_ITERATIONS;
 
-  for (u_int i = 0; i < iterations; i++)
-    work (ACE_Thread_Manager::instance (),
-          n_tasks,
-          stack_size);
+  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
 
+  for (;;)
+    work (thr_mgr, n_tasks, stack_size);
   ACE_NOTREACHED (return 0);
 }
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 96bf4c5a465..2799e798b7f 100644
--- a/examples/Timer_Queue/Makefile
+++ b/examples/Timer_Queue/Makefile
@@ -24,7 +24,7 @@ LSRC  	= Async_Timer_Queue_Test.cpp \
 
 LDLIBS 	= -lTQTD
 
-LIBS   += $(ACELIB)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
 
diff --git a/examples/Web_Crawler/URL_Visitor.cpp b/examples/Web_Crawler/URL_Visitor.cpp
index f31e98613a0..a32ae8b7695 100644
--- a/examples/Web_Crawler/URL_Visitor.cpp
+++ b/examples/Web_Crawler/URL_Visitor.cpp
@@ -430,8 +430,6 @@ URL_Processing_Strategy *
 URL_Download_Visitation_Strategy_Factory::make_header_strategy (URL_Iterator &iterator)
 {
   // You fill in here.
-  ACE_UNUSED_ARG (iterator);
-
   return 0;
 }
 
@@ -537,30 +535,29 @@ template class ACE_NOOP_Concurrency_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, AC
 template class 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_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>;
 template class 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>;
-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_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  >   >, 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_LRU_Caching_Strategy<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_Cached_Connect_Strategy_Ex<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_LRU_Caching_Strategy<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_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_Hash_Map_Manager_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int> >;
-template class ACE_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>, ACE_SOCK_CONNECTOR>;
-template class ACE_Hash_Map_Iterator_Base_Ex<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_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_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_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> *, int> >;
+template class ACE_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>, ACE_SOCK_Connector>;
+template class ACE_Hash_Map_Iterator_Base_Ex<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_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_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_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_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_LRU_Caching_Strategy<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_Cache_Map_Reverse_Iterator<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_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_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_Cache_Map_Iterator<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_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_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_Cleanup_Strategy<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_Hash_Map_Entry<ACE_URL_Addr, URL_Status>;
-template class ACE_Hash_Map_Iterator_Base_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> > ;
-template class ACE_Connector<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>, ACE_SOCK_CONNECTOR>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> > *, ACE_RW_Thread_Mutex>;
-template class ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >;
+template class ACE_Hash_Map_Iterator_Base_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> > ;
+template class ACE_Connector<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>, ACE_SOCK_Connector>;
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> > *, ACE_RW_Thread_Mutex>;
+template class ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> >;
 template class ACE_Hash_Map_Iterator_Base_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
-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_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_Default_Cleanup_Strategy<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_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_Caching_Strategy_Utility<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>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Manager<ACE_URL_Addr, URL_Status, ACE_Null_Mutex>
 #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
@@ -568,31 +565,30 @@ template class ACE_Svc_Caching_Strategy_Utility<ACE_Refcounted_Hash_Recyclable<A
 #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_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_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_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>
 #pragma instantiate 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>
-#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_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  >   >, 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_Hash_Map_Manager_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int> >
-#pragma instantiate ACE_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<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_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_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_LRU_Caching_Strategy<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_Cached_Connect_Strategy_Ex<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_LRU_Caching_Strategy<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_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_Hash_Map_Manager_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
+#pragma instantiate ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> *, int> >;
+#pragma instantiate ACE_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>, ACE_SOCK_Connector>;
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<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_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_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_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_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_LRU_Caching_Strategy<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_Cache_Map_Reverse_Iterator<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_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_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_Cache_Map_Iterator<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_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_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_Cleanup_Strategy<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_Hash_Map_Entry<ACE_URL_Addr, URL_Status>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_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> > 
-#pragma instantiate ACE_Connector<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> > *, ACE_RW_Thread_Mutex>
-#pragma instantiate ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >
+#pragma instantiate ACE_Hash_Map_Iterator_Base_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> > 
+#pragma instantiate ACE_Connector<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>, ACE_SOCK_Connector>
+#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> > *, ACE_RW_Thread_Mutex>
+#pragma instantiate ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> >
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>
-#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_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_Default_Cleanup_Strategy<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_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_Caching_Strategy_Utility<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>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Web_Crawler/URL_Visitor.h b/examples/Web_Crawler/URL_Visitor.h
index 651ff814a80..1469fa7803e 100644
--- a/examples/Web_Crawler/URL_Visitor.h
+++ b/examples/Web_Crawler/URL_Visitor.h
@@ -28,7 +28,6 @@
 #include "ace/Caching_Strategies_T.h"
 #include "ace/Cached_Connect_Strategy_T.h"
 #include "Options.h"
-#include "ace/Pair_T.h"
 
 // Forward declarations.
 class URL_Validation_Visitor;
@@ -225,7 +224,6 @@ protected:
   // Make the appropriate <URL_Visitation_Strategy_Factory>.
 };
 
-
 class URL_Validation_Visitor : public URL_Visitor
 {
   // = TITLE
@@ -271,31 +269,24 @@ public:
                                   ACE_Pair<Svc_Handler *, int>,\
                                   ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, \
                                   ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\
-                                  ACE_Null_Mutex> 
-          CONNECTION_HASH_MAP;
+                                 ACE_Null_Mutex> 
+    CONNECTION_HASH_MAP;
   typedef ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\
                                   ACE_Pair<Svc_Handler *, int>,\
                                   ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, \
                                   ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\
-                                  ACE_Null_Mutex> 
-          CONNECTION_HASH_MAP_ITERATOR;
+                                 ACE_Null_Mutex> 
+    CONNECTION_HASH_MAP_ITERATOR;
   typedef ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\
                                   ACE_Pair<Svc_Handler *, int>,\
                                   ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, \
                                   ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\
-                                  ACE_Null_Mutex> 
-          CONNECTION_HASH_MAP_REVERSE_ITERATOR;
-  typedef ACE_Svc_Caching_Strategy_Utility <REFCOUNTED_HASH_RECYCLABLE_ADDRESS, \
-                                            ACE_Pair<Svc_Handler *, int>, \
-                                            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,\
-                                   SVC_CACHING_STRATEGY_UTILITY >
-          LRU;
+                                 ACE_Null_Mutex> 
+    CONNECTION_HASH_MAP_REVERSE_ITERATOR;
+  typedef ACE_LRU_Caching_Strategy<CONNECTION_HASH_MAP>
+         LRU;
   typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler,ACE_SOCK_CONNECTOR, LRU, ACE_SYNCH_NULL_MUTEX>
-          CACHED_CONNECT_STRATEGY;
+         CACHED_CONNECT_STRATEGY;
 
 protected:
   virtual ~URL_Validation_Visitor (void);
@@ -320,7 +311,6 @@ protected:
   STRAT_CONNECTOR *strat_connector_;  
 };
 
-
 class URL_Download_Visitor : public URL_Visitor
 {
   // = TITLE
@@ -376,4 +366,5 @@ private:
   T *t_;
 };
 
+
 #endif /* _URL_VISITOR_H */
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU
index 30ae0b98208..7adbbfb284e 100644
--- a/include/makeinclude/platform_aix4_cset++.GNU
+++ b/include/makeinclude/platform_aix4_cset++.GNU
@@ -17,27 +17,21 @@
 # or a successor.
 
 debug = 1
+# xlC builds the shared lib from the static lib, so need to build both.
+shared_libs_only = 0
+static_libs = 1
 
 # In case anything here or in the config depends on OS version number,
 # grab it here and pass it all to the compiler as well.
 AIX_MAJOR_VERS := $(shell uname -v)
 AIX_MINOR_VERS := $(shell uname -r)
 
-CC	    = xlc_r
+CC	    = xlC
 CXX	    = xlC_r
 
 # -qextchk is handy, but produces false type mismatches when linking
 # netsvcs with 3.1.4, so it's disabled.  IBM reports this fixed in 3.6.4.
-CCFLAGS     += $(CFLAGS) -qtempinc -qinfo
-# AIX 4.3 and IBM C/C++ compilers 3.6.4 produce a bazillion warnings
-# about 0-valued preprocessor defs. The problem may be a 3.6.4 compiler thing,
-# but the only way I know of at this moment to turn the things off is to switch
-# it based on the OS minor vers (assuming AIX 4.3 is used w/ xlC 3.6.4).
-ifeq ($(AIX_MINOR_VERS),3)
- CCFLAGS    += -qflag=e:e
-else
- CCFLAGS    += -qflag=w:w
-endif
+CCFLAGS     += $(CFLAGS) -qtempinc -qflag=w:w -qinfo
 CPPFLAGS    += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
 
 # -qinitauto seems useful, but when built with -qinitauto=5F, the
@@ -46,10 +40,9 @@ DCFLAGS     += -g -qcheck=nobounds:div:null
 
 DLD	    = makeC++SharedLib_r
 LD          = $(CXX)
-
-ifeq ($(shared_libs),1)
-ACELIB      = -lACEshr
 SHLIBA      = $(SHLIB:lib%.so=lib%shr.a)
+ifdef SHLIB
+ACELIB      = -lACEshr
 endif
 
 ifeq ($(AIX_MINOR_VERS),1)
@@ -71,6 +64,6 @@ LDFLAGS	    += -bI:/lib/pse.exp
 OCCFLAGS    += -qarch=com 
 RANLIB	    = ranlib
 SOFLAGS	    = -p 0
+STATLIB     = $(VLIB)
 TEMPINCDIR  = tempinc
-TMPL_OBJS := $(TEMPINCDIR)/*.o
 SOBUILD = 
diff --git a/include/makeinclude/platform_aix4_g++.GNU b/include/makeinclude/platform_aix4_g++.GNU
deleted file mode 100644
index 69793ceb341..00000000000
--- a/include/makeinclude/platform_aix4_g++.GNU
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id$
-#
-# Platform macros for building on AIX 4.x with g++.  This has been tested on
-# AIX 4.3 with egcs 1.1.2.
-#
-# Original contributed by Ian Wright <I.Wright@elsevier.co.uk>. Updated for
-# AIX 4 and egcs by Steve Huston <shuston@riverace.com>.
-
-debug = 1
-optimize = 0
-threads = 1
- 
-# In case anything here or in the config depends on OS version number,
-# grab it here and pass it all to the compiler as well.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-
-CC             = gcc
-CXX            = g++
-CFLAGS         += -W -Wall -pipe -mcpu=common -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
-ifeq ($(threads),1)
-CFLAGS         += -mthreads
-endif
-CCFLAGS        += $(CFLAGS) -fno-implicit-templates
-DCFLAGS        += -g
-DLD             = $(CXX)
-LD              = $(CXX)
-LDFLAGS	       += -Wl,-bI:/lib/pse.exp 
-OCFLAGS         = -O2
-OCCFLAGS        = $(OCFLAGS)
-ifeq ($(threads),1)
-SOFLAGS        += -mthreads
-endif
-SOFLAGS        += -shared -Wl,-bexpall # -Wl,-bloadmap:lib.map
-LIBS           += -ltli_r -ldl
-ARFLAGS         = cruv
-RANLIB          = ranlib
-
-# On AIX, shared libraries are not generally left in .so form to link against.
-# To do so requires the run-time linker and that is an unnecessary evil.
-# So build the .so as usual, but then put in an archive library to link
-# against. The archive lib is the one installed for run-time use also, though
-# if you want to use ACE's dynamic loading features, you'll also need the
-# .so file.
-ifeq ($(shared_libs),1)
-ACELIB          = -lACEshr
-SHLIBA          = $(SHLIB:lib%.so=lib%shr.a)
-endif
diff --git a/include/makeinclude/platform_irix6.x_g++.GNU b/include/makeinclude/platform_irix6.x_g++.GNU
index 0541ebf6ad2..6f5b802feea 100644
--- a/include/makeinclude/platform_irix6.x_g++.GNU
+++ b/include/makeinclude/platform_irix6.x_g++.GNU
@@ -4,12 +4,8 @@
 
 include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(optimize))
-  optimize = 1
-endif
+debug = 1
+optimize = 1
 
 CC              = gcc
 CXX             = g++
diff --git a/include/makeinclude/platform_irix6.x_sgic++.GNU b/include/makeinclude/platform_irix6.x_sgic++.GNU
index d3edb63bdf7..656e8daf016 100644
--- a/include/makeinclude/platform_irix6.x_sgic++.GNU
+++ b/include/makeinclude/platform_irix6.x_sgic++.GNU
@@ -5,12 +5,8 @@
 # environment variable to -n32.  This causes a new compiler to be
 # invoked.
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(optimize))
-  optimize = 1
-endif
+debug = 1
+optimize = 1
 
 include $(ACE_ROOT)/include/makeinclude/platform_irix6.x_common.GNU
 
diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU
index bd1f539f4bd..0409487e18c 100644
--- a/include/makeinclude/platform_linux_lxpthread.GNU
+++ b/include/makeinclude/platform_linux_lxpthread.GNU
@@ -8,13 +8,9 @@
 # to compile it yourself (no binaries included) --
 # Jan Rychter <jwr@icm.edu.pl>
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(optimize))
-  optimize = 1
-endif
-  xt_reactor = 0
+debug = 1
+optimize = 1
+xt_reactor = 0
 
 PLATFORM_XT_CPPFLAGS=
 PLATFORM_XT_LIBS=-lXt
@@ -34,9 +30,6 @@ PLATFORM_GL_CPPFLAGS=
 PLATFORM_GL_LIBS=-lMesaGL
 PLATFORM_GL_LDFLAGS=
 
-PLATFORM_AIO_SUPPORT := \
-  $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
-
 ifeq ($(NO_IMPLICIT_TEMPLATES),)
       NO_IMPLICIT_TEMPLATES = -fno-implicit-templates
 endif
@@ -44,16 +37,12 @@ endif
 CC      = gcc
 CXX     = g++
 CFLAGS  += -Wall -pipe \
-           -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
-           $(PLATFORM_AIO_SUPPORT)
+           -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT
 CCFLAGS += $(CFLAGS) $(NO_IMPLICIT_TEMPLATES)
 DCFLAGS += -g
 DLD     = $(CXX)
 LD      = $(CXX)
-LIBS    += -ldl -lpthread
-ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT))
-  LIBS += -lrt
-endif
+LIBS    += -ldl -lpthread -lrt
 OCFLAGS += -O3
 PIC     = -fPIC
 AR      = ar
diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU
index bd1f539f4bd..0409487e18c 100644
--- a/include/makeinclude/platform_linux_lxpthreads.GNU
+++ b/include/makeinclude/platform_linux_lxpthreads.GNU
@@ -8,13 +8,9 @@
 # to compile it yourself (no binaries included) --
 # Jan Rychter <jwr@icm.edu.pl>
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(optimize))
-  optimize = 1
-endif
-  xt_reactor = 0
+debug = 1
+optimize = 1
+xt_reactor = 0
 
 PLATFORM_XT_CPPFLAGS=
 PLATFORM_XT_LIBS=-lXt
@@ -34,9 +30,6 @@ PLATFORM_GL_CPPFLAGS=
 PLATFORM_GL_LIBS=-lMesaGL
 PLATFORM_GL_LDFLAGS=
 
-PLATFORM_AIO_SUPPORT := \
-  $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS)
-
 ifeq ($(NO_IMPLICIT_TEMPLATES),)
       NO_IMPLICIT_TEMPLATES = -fno-implicit-templates
 endif
@@ -44,16 +37,12 @@ endif
 CC      = gcc
 CXX     = g++
 CFLAGS  += -Wall -pipe \
-           -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
-           $(PLATFORM_AIO_SUPPORT)
+           -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT
 CCFLAGS += $(CFLAGS) $(NO_IMPLICIT_TEMPLATES)
 DCFLAGS += -g
 DLD     = $(CXX)
 LD      = $(CXX)
-LIBS    += -ldl -lpthread
-ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT))
-  LIBS += -lrt
-endif
+LIBS    += -ldl -lpthread -lrt
 OCFLAGS += -O3
 PIC     = -fPIC
 AR      = ar
diff --git a/include/makeinclude/platform_qnx_neutrino.GNU b/include/makeinclude/platform_qnx_neutrino.GNU
deleted file mode 100644
index 3ddc737adb8..00000000000
--- a/include/makeinclude/platform_qnx_neutrino.GNU
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-
-# QNX 4.25 hosted GNU g++ for Neutrino 2.0 Beta
-
-# NOTE: with g++ 2.8.0, you'll need to disable optimization in order to
-#       instantiate ACE_Map_Manager (ace/Map_Manager.cpp).  The easiest
-#       way to do that is to set "optimize = 0", either below or on
-#       your make command line.
-
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(optimize))
-  optimize = 0
-endif
-
-static_libs_only = 1
-
-CC      = /usr/gcc/bin/i386-nto-gcc
-CXX     = /usr/gcc/bin/i386-nto-g++
-CFLAGS  += -pipe -Wall -Wpointer-arith -Winline
-CCFLAGS += $(CFLAGS) -fno-implicit-templates
-DCFLAGS += -g
-DLD     = $(CXX)
-LD      = $(CXX)
-LDFLAGS +=
-LIBS    += -lsocket -lstdc++
-OCFLAGS += -O2
-PIC     = -fPIC
-AR      = /usr/gcc/bin/ar
-ARFLAGS = ruv
-RANLIB  = /usr/gcc/bin/ranlib
-SOFLAGS = -G $(CPPFLAGS) -shared
-SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-PRELIB  = @true
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index bcd304f0aef..9056fdddf8b 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -10,15 +10,9 @@
 # NOTE: On Solaris86, you'll need to use GNU as instead of /usr/ccs/bin/as,
 #       if you want -gstabs+ and -pipe support.
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(optimize))
-  optimize = 1
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
+debug = 1
+optimize = 1
+threads = 1
 
 ifeq ($(threads),0)
   CFLAGS += -DACE_MT_SAFE=0
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index f551c5d9814..1fda9c3cd58 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -24,15 +24,9 @@
 # size should not be penalized.  We don't use it because it's not
 # necessary with automatic template instantiation.
 
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(distrib))
-  distrib = 0
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
+debug = 1
+distrib = 0
+threads = 1
 
 tk_reactor = 0
 ace_with_x11 = 0
@@ -69,12 +63,9 @@ ifeq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
     #### without -features=rtti, to convert dynamic_cast to static_cast.
     CCFLAGS += -DACE_LACKS_RTTI
   endif # ! rtti
-
-  #### Create template repository to avoid compiler warning.
-  TEMPLATE_REPOSITORY = Templates.DB
 else  # ! 4.2
 ifeq (Compilers 5,$(findstring Compilers 5,$(CC_VERSION)))
-  #### CC 5.0 or later
+#### CC 5.0 or later
   #### Inlining appears to cause link problems with early releases of
   #### CC 5.0.
   inline = 0
@@ -129,6 +120,9 @@ ARFLAGS         = -xar -o
 RANLIB          = echo
 SOFLAGS         = -G $(CPPFLAGS)
 
+#### Create template repository to avoid compiler warning.
+TEMPLATE_REPOSITORY = Templates.DB
+
 ifdef BIN
   #### Builds .shobj/$*.o file, then .shobj/$*.so file.  The .o files
   #### are used for building libraries and executables.  But, it seems
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index 4af15f05119..14b8ea5e2e2 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -19,13 +19,12 @@ ifndef SOEXT
 endif
 
 VSHLIB  = $(SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT))
-ifdef SHLIBA
-VSHLIBA = $(SHLIBA:%.a=%$(VAR).a)
-endif
-
 VLOBJS   = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VDIR)$(notdir $(file))))
 
-LSRC    += $(LSRC2)
+ifdef TEMPINCDIR
+  VSHOBJS1 =
+else  # ! TEMPINCDIR
+  LSRC    += $(LSRC2)
 ifdef PRELIB
 ifdef PRELIB_USES_OBJ_ONLY
   VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
@@ -38,6 +37,7 @@ else  # ! PRELIB
   VSHOBJS1 = \
     $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
 endif # ! PRELIB
+endif # ! TEMPINCDIR
 
 # Comment out for now...
 # $(DEFS:%=$(INSINC)/%) \
@@ -45,18 +45,12 @@ endif # ! PRELIB
 ifdef shared_libs_only
   INSTALL += \
     $(VSHLIB:%.$(SOEXT)=$(INSLIB)/%.$(SOEXT)$(ACE_LDSO_Version_Number))
-ifdef SHLIBA
-  INSTALL += $(VSHLIBA:%=$(INSLIB)/%)
-endif
 else
 ifdef static_libs_only
   INSTALL += $(VLIB:%.a=$(INSLIB)/%.a)
 else
   INSTALL += $(VLIB:%.a=$(INSLIB)/%.a) \
     $(VSHLIB:%.$(SOEXT)=$(INSLIB)/%.$(SOEXT)$(ACE_LDSO_Version_Number))
-ifdef SHLIBA
-  INSTALL += $(VSHLIBA:%=$(INSLIB)/%)
-endif
 endif # static_libs_only
 endif # shared_libs_only
 
@@ -74,7 +68,7 @@ ifdef PRELIB
 endif
 
 # Comment these lines out if you want to build both *.a and *.so libraries...
-#$(VSHLIB): $(VSHOBJS)
+#$(VSHLIB): $(VSHOBJS) $(STATLIB)
 #ifdef PRELIB
 #	$(PRELIB)
 #endif
@@ -93,7 +87,7 @@ ifdef TEMPINCDIR
 # templates.
 	if test -s ./$(TEMPINCDIR)/*.C; \
 	then \
-		$(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(LIBS); \
+		$(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $@ $(LIBS); \
 		$(RM) dummy; \
 		$(AR) $(ARFLAGS) $@ tempinc/*.o; \
 	fi
@@ -105,26 +99,17 @@ endif # RANLIB
 
 # Note that if you don't want to build shared libraries, just remove the $(VSHOBJS)
 ifdef SHLIBBUILD
-$(VSHLIB): $(VSHOBJS)
+$(VSHLIB): $(VSHOBJS) $(STATLIB)
 else
-$(VSHLIB): $(VSHOBJS1)
+$(VSHLIB): $(VSHOBJS1) $(STATLIB)
 endif
 ifdef PRELIB
 	$(PRELIB)
 endif
-ifdef TEMPINCDIR
-# This is required to get AIX xlC to instantiate and compile the needed
-# templates before building the library.
-	if test -s ./$(TEMPINCDIR)/*.C; \
-	then \
-		$(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $^ $(LIBS); \
-		$(RM) dummy; \
-	fi
-endif
 ifdef SHLIBBUILD
 	$(SHLIBBUILD)
 else
-	$(SOLINK.cc) -o $@ $(VSHOBJS1) $(TMPL_OBJS) $(LDFLAGS) $(LIBS)
+	$(SOLINK.cc) -o $@ $(VSHOBJS1) $(LDFLAGS) $(LIBS) $(STATLIB)
 	-chmod a+rx $@
 endif
 
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index e3624eb97fb..a36f854f89a 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -33,7 +33,7 @@
 #  rtti             Enable run-time type identification.  On some platforms,
 #                     it is enabled by default, so this is ignored.
 #  shared_libs      Build shared libraries. Ignored if static_libs_only is set.
-#  static_libs      Build static libraries. Ignored if shared_libs_only is set.
+#  static_libs      Build shared libraries. Ignored if shared_libs_only is set.
 #  shared_libs_only Only build shared libraries.  Ignored if no SHLIBs are
 #                     specified by the Makefile, as in performance-tests/Misc.
 #  static_libs_only Only build static libraries.
@@ -384,10 +384,6 @@ ifdef shared_libs
       endif # BIN
     endif # ! SHLIB
   endif # ! static_libs
-
-  ifdef SHLIBA
-    LDLIBS := $(LDLIBS:-l%=-l%shr)
-  endif # SHLIBA
 else # ! shared_libs
   ifdef static_libs
     #### Don't build shared libs.
@@ -404,7 +400,11 @@ else # ! shared_libs
   endif # ! static_libs
 endif # ! shared_libs
 
-VLDLIBS := $(LDLIBS) $(ACELIB) $(LIBS)
+ifdef SHLIBA
+  VLDLIBS := $(LDLIBS) -lACEshr $(LIBS)
+else
+  VLDLIBS := $(LDLIBS) $(ACELIB) $(LIBS)
+endif # SHLIBA
 
 ifeq ($(probe),0)
   override probe =
diff --git a/netsvcs/ACE-netsvcs.html b/netsvcs/ACE-netsvcs.html
index 195e696cf0d..f0dccb6b2b6 100644
--- a/netsvcs/ACE-netsvcs.html
+++ b/netsvcs/ACE-netsvcs.html
@@ -53,7 +53,7 @@ Configurator</A>, which is an object-oriented framework that automates
 the configuration and reconfiguration of multi-service daemons.  All
 the ACE network services are configured using the Service
 Configurator.  Please refer to the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">online
+HREF="http://www.cs.wustl.edu/~schmidt/ACE-INSTALL.html">online
 documentation</a> for more information on installing and testing the
 ACE network services.<P>
 
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/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/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/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/os-patches/vxworks-5.1.txt b/os-patches/vxworks-5.1.txt
deleted file mode 100644
index dbf657bf854..00000000000
--- a/os-patches/vxworks-5.1.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id$
-
-An anonymous contributor provided the following notes for using ACE
-with VxWorks 5.1:
-
-Hope this helps someone else. Note that I didn't run the tests on ACE so
-I can't say that everything works.  What I ended up doing was writing a
-few tests of my own to test out some of the features and get a feel for
-what ACE could do so beware that maybe these aren't the
-only things that one would have to change.
-
-    1) Prerequisite -- make sure C++ run time support is working (like
-       global/static constructor/destructor invocation)
-
-    2) Used "$ACE_ROOT/include/makeinclude/platform_macros.GNU" for a guide
-          to setup my environment variables.
-
-            - ACE_ROOT, WIND_BASE, WIND_HOST_TYPE, CPU, and TOOLENV
-
-    3) copied $ACE_ROOT/ace/config-vxworks5.x.h to $ACE_ROOT/ace/config.h
-
-    4) copied $ACE_ROOT/include/makeinclude/platform_vxworks5.x_g++.GNU
-       to  $ACE_ROOT/include/makeinclude/platform_macros.GNU
-
-    5) had to modify ${ACE_ROOT}/include/makeinclude/platform_macros.GNU
-       to add -DCPU=SPARClite, -msparclite to CCFLAGS and add
-         $(ACE_ROOT) and /usr/local/lib/g++-include to INCLDIRS
-
-        I think this was a "make" issue.
-
-    6) had to modify $ACE_ROOT/ace/config.h
-       to set/reset the following ACE configuration parameters:
-
-        ACE_LACKS_POSIX_TIME, ACE_LACKS_SIGINFO_T, ACE_LACKS_IOSTREAM_TOTALLY,
-        ACE_NEEDS_FTRUNCATE, ACE_LACKS_ACE_IOSTREAM
-
-    7) added the following to $ACE_ROOT/ace/config.h:
-
-#define ACE_SIZEOF_CHAR                 1
-#define ACE_SIZEOF_SHORT                2
-#define ACE_SIZEOF_INT                  4
-#define ACE_SIZEOF_LONG                 4
-#define ACE_SIZEOF_LONG_LONG            8
-#define ACE_SIZEOF_FLOAT                4
-#define ACE_SIZEOF_DOUBLE               8
-#define ACE_SIZEOF_LONG_DOUBLE          16
-#define ACE_SIZEOF_VOID_P               4
-
-/*
- *  Since VxWorks does have clock_gettime() I really didn't want
- *  to set ACE_LACKS_CLOCK_GETTIME to get this define, so I made
- *  one of my own.
- */
-typedef int clockid_t;
-
-/*
- *  Prototypes for VxWorks functions that ACE uses.
- */
-extern "C" char *sysBspRev(void);
-extern "C" char *getcwd(char *, int);
-extern "C" int  clock_gettime(clockid_t, struct timespec *);
-extern "C" int  nanosleep(const struct timespec *, struct timespec *);
-
-/*
- *  These because of some quirks with ACE_LACKS_IOSTREAMS_TOTALLY
- */
-#define ACE_DEFAULT_LOG_STREAM  0
-
-     8) I changed the last call argument in Log_Msg.cpp line 1095 from:
-
-          this->msg_ostream ());
-
-        to this:
-
-          (FILE *) (this->msg_ostream ()));
-
-     9) I used the 2.7.2.1 GNU compiler.
diff --git a/performance-tests/Server_Concurrency/Latency_Stats.h b/performance-tests/Server_Concurrency/Latency_Stats.h
deleted file mode 100644
index 02f7b0caa9b..00000000000
--- a/performance-tests/Server_Concurrency/Latency_Stats.h
+++ /dev/null
@@ -1,205 +0,0 @@
-// $Id$
-
-class Latency_Stats
-{
-public:
-  Latency_Stats (void);
-
-  void dump_results (const char* test_name,
-                     const char* sub_test);
-
-  void sample (ACE_hrtime_t sample);
-
-  void accumulate (const Latency_Stats& stats);
-  // Useful to merge several Latency_Stats.
-
-private:
-  u_long n_;
-  ACE_hrtime_t sum_;
-  ACE_hrtime_t sum2_;
-  ACE_hrtime_t min_;
-  ACE_hrtime_t max_;
-};
-
-inline
-Latency_Stats::Latency_Stats (void)
-  :  n_ (0),
-     sum_ (0),
-     sum2_ (0),
-     min_ (0),
-     max_ (0)
-{
-}
-
-inline void
-Latency_Stats::sample (ACE_hrtime_t sample)
-{
-  this->sum_  += sample;
-  this->sum2_ += sample * sample;
-  if (this->n_ == 0)
-    {
-      this->min_ = sample;
-      this->max_ = sample;
-    }
-  if (this->min_ > sample)
-    this->min_ = sample;
-  if (this->max_ < sample)
-    this->max_ = sample;
-  this->n_++;
-}
-
-inline void
-Latency_Stats::dump_results (const char *test_name,
-                                          const char *sub_test)
-{
-  if (this->n_ < 1)
-    return;
-
-  ACE_hrtime_t avg = this->sum_ / this->n_;
-  ACE_hrtime_t dev =
-    this->sum2_ / this->n_ - avg*avg;
-
-  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-
-  double min_usec = ACE_CU64_TO_CU32 (this->min_) / gsf;
-  double max_usec = ACE_CU64_TO_CU32 (this->max_) / gsf;
-  double avg_usec = ACE_CU64_TO_CU32 (avg) / gsf;
-  double dev_usec = ACE_CU64_TO_CU32 (dev) / (gsf * gsf);
-  ACE_DEBUG ((LM_DEBUG,
-              "%s/%s: %.2f/%.2f/%.2f/%.2f (min/avg/max/var^2) [usecs]\n",
-              test_name, sub_test,
-              min_usec, avg_usec, max_usec, dev_usec));
-}
-
-inline void
-Latency_Stats::accumulate (const Latency_Stats& rhs)
-{
-  if (rhs.n_ == 0)
-    return;
-
-  if (this->n_ == 0)
-    {
-      this->n_    = rhs.n_;
-      this->min_  = rhs.min_;
-      this->max_  = rhs.max_;
-      this->sum_  = rhs.sum_;
-      this->sum2_ = rhs.sum2_;
-      return;
-    }
-
-  if (this->min_ > rhs.min_)
-    this->min_ = rhs.min_;
-  if (this->max_ < rhs.max_)
-    this->max_ = rhs.max_;
-
-  this->sum_  += rhs.sum_;
-  this->sum2_ += rhs.sum2_;
-  this->n_    += rhs.n_;
-}
-
-class Throughput_Stats
-{
-public:
-  Throughput_Stats (void);
-
-  void dump_results (const char* test_name,
-                     const char* sub_test);
-
-  void sample (void);
-  // An event has been received
-
-  void accumulate (const Throughput_Stats& stats);
-  // Useful to merge several Throughput_Stats.
-
-private:
-  u_long n_;
-  ACE_hrtime_t start_;
-  ACE_hrtime_t stop_;
-};
-
-inline void
-Throughput_Stats::accumulate (const Throughput_Stats& rhs)
-{
-  if (this->n_ == 0)
-    {
-      this->start_ = rhs.start_;
-      this->stop_ = rhs.stop_;
-      this->n_ = rhs.n_;
-      return;
-    }
-
-  if (this->start_ > rhs.start_)
-    this->start_ = rhs.start_;
-
-  if (this->stop_ < rhs.stop_)
-    this->stop_ = rhs.stop_;
-
-  this->n_ += rhs.n_;
-}
-
-inline void
-Throughput_Stats::dump_results (const char *test_name,
-                                           const char *subtest)
-{
-  if (this->n_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s/%s: no events recorded\n",
-                  test_name, subtest));
-      return;
-    }
-
-  ACE_Time_Value tv;
-  ACE_High_Res_Timer::hrtime_to_tv (tv, this->stop_ - this->start_);
-
-  double f = 1.0/(tv.sec () + tv.usec () / 1000000.0);
-  double events_per_second = this->n_ * f;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "%s/%s: "
-              "%d / %d.%06.6d = %.3f events/second\n",
-              test_name, subtest,
-              this->n_,
-              tv.sec (), tv.usec (),
-              events_per_second));
-}
-
-inline
-Throughput_Stats::Throughput_Stats (void)
-  : n_ (0)
-{
-}
-
-inline void
-Throughput_Stats::sample (void)
-{
-  if (this->n_ == 0)
-    {
-      this->start_ = ACE_OS::gethrtime ();
-    }
-  this->n_++;
-  this->stop_ = ACE_OS::gethrtime ();
-}
-
-inline void
-move_to_rt_class (void)
-{
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
-  int result = ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                                       priority,
-                                                       ACE_SCOPE_PROCESS));
-  if (result == 0)
-    {
-      result = ACE_OS::thr_setprio (priority);
-    }
-
-  if (result != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Cannot move program to realtime class.\n"));
-    }
-}
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp b/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp
deleted file mode 100644
index b1bf8fdafae..00000000000
--- a/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Leader_Follower" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=Leader_Follower - 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 "Leader_Follower.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 "Leader_Follower.mak" CFG="Leader_Follower - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

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

-!MESSAGE "Leader_Follower - 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)" == "Leader_Follower - 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 "..\..\.." /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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Leader_Follower - 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 "..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Leader_Follower - Win32 Release"

-# Name "Leader_Follower - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\leader_follower.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/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsw b/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.dsw
deleted file mode 100644
index 7b90119e3f1..00000000000
--- a/performance-tests/Server_Concurrency/Leader_Follower/Leader_Follower.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: "Leader_Follower"=".\Leader_Follower.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

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

diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Makefile b/performance-tests/Server_Concurrency/Leader_Follower/Makefile
deleted file mode 100644
index 7c0586fafa5..00000000000
--- a/performance-tests/Server_Concurrency/Leader_Follower/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id$
-#
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-BIN     = leader_follower
-
-FILES   = $(BIN)
-LSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-CPPFLAGS += -I..
-
-BUILD   = $(VOBJS) $(VBIN)
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
deleted file mode 100644
index 598140e20f3..00000000000
--- a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-// $Id$
-
-#include "ace/Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "../Latency_Stats.h"
-
-static size_t number_of_messages = 100;
-static size_t message_size = 100;
-static size_t number_of_threads = 10;
-static size_t burst_size = 10;
-static size_t timeout_between_bursts = 1;
-
-static size_t leader_available = 0;
-static size_t messages_in_this_burst = 0;
-static size_t total_messages_consumed = 0;
-static size_t burst = 1;
-
-static ACE_hrtime_t start_of_burst;
-
-enum DEBUGGING_RANGE
-{
-  NONE = 0,
-  DEFAULT = 1,
-  PRINT_INDIVIDUAL_LATENCY = 2
-};
-
-static DEBUGGING_RANGE debug = NONE;
-
-typedef ACE_Task<ACE_MT_SYNCH> TASK;
-
-class Leader_Follower_Task : public TASK
-{
-public:
-  Leader_Follower_Task (ACE_SYNCH_MUTEX &mutex,
-                        ACE_SYNCH_CONDITION &condition);
-  int svc (void);
-
-  size_t messages_consumed_;
-  ACE_SYNCH_MUTEX &mutex_;
-  ACE_SYNCH_CONDITION &condition_;
-
-  Latency_Stats latency_stats_;
-  Throughput_Stats throughput_stats_;
-};
-
-Leader_Follower_Task::Leader_Follower_Task (ACE_SYNCH_MUTEX &mutex,
-                                            ACE_SYNCH_CONDITION &condition)
-  : messages_consumed_ (0),
-    mutex_ (mutex),
-    condition_ (condition)
-{
-}
-
-int
-Leader_Follower_Task::svc (void)
-{
-  for (;;)
-    {
-      {
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-
-        // Wait until there is no leader.
-        while (leader_available)
-          {
-            int result = this->condition_.wait ();
-            if (result == -1)
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "Leader_Follower_Task::svc (%t) -> %p\n",
-                                   "wait error"),
-                                  -1);
-              }
-          }
-
-        // I am the leader.
-        leader_available = 1;
-
-        //
-        // We are letting go of the leader follower lock before going
-        // in the event loop.
-        //
-      }
-
-      //
-      // It is ok to modify these shared variables without a lock
-      // since we are the only leader.
-      //
-
-      int exit_loop = 0;
-      if (number_of_messages == 0)
-        {
-          exit_loop = 1;
-        }
-      else
-        {
-          if (messages_in_this_burst == burst_size)
-            {
-              ++burst;
-              messages_in_this_burst = 0;
-              ACE_OS::sleep (timeout_between_bursts);
-            }
-
-          if (messages_in_this_burst == 0)
-            {
-              start_of_burst = ACE_OS::gethrtime ();
-            }
-
-          --number_of_messages;
-
-          // Burst counter.
-          ++messages_in_this_burst;
-
-          // Global counter.
-          ++total_messages_consumed;
-
-          // Local counter.
-          ++this->messages_consumed_;
-
-          if (debug)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%t) burst %d: message %d; overall message %d; message for this thread %d\n",
-                          burst,
-                          messages_in_this_burst,
-                          total_messages_consumed,
-                          this->messages_consumed_));
-            }
-        }
-
-      {
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
-
-        // I am no longer the leader.
-        leader_available = 0;
-
-        // Wake up a follower.
-        this->condition_.signal ();
-      }
-
-      if (exit_loop)
-        {
-          break;
-        }
-      else
-        {
-          //
-          // Process message here.
-          //
-
-          for (size_t j = 0; j < message_size; ++j)
-            {
-              // Eat a little CPU
-              /* takes about 40.2 usecs on a 167 MHz Ultra2 */
-              u_long n = 11UL;
-              ACE::is_prime (n, 2, n / 2);
-            }
-
-          //
-          // Record stats for this message.
-          //
-          ACE_hrtime_t latency_from_start_of_burst =
-            ACE_OS::gethrtime () - start_of_burst;
-          this->latency_stats_.sample (latency_from_start_of_burst);
-
-          this->throughput_stats_.sample ();
-
-          if (debug >= PRINT_INDIVIDUAL_LATENCY)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%t) latency from start of burst: %Q\n",
-                          latency_from_start_of_burst));
-            }
-        }
-    }
-
-  return 0;
-}
-
-static int
-parse_args (int argc, ASYS_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("m:s:w:b:t:d:"));
-  int c;
-
-  while ((c = get_opt ()) != -1)
-    {
-      switch (c)
-        {
-        case 'm':
-          number_of_messages = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 's':
-          message_size = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'w':
-          number_of_threads = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'b':
-          burst_size = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 't':
-          timeout_between_bursts = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'd':
-          debug = ACE_static_cast (DEBUGGING_RANGE, ACE_OS::atoi (get_opt.optarg));
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "usage: %s\n"
-                             "\t[-m number of messages]\n"
-                             "\t[-s message size]\n"
-                             "\t[-w number of threads]\n"
-                             "\t[-b burst size]\n"
-                             "\t[-t timeout between bursts]\n"
-                             "\t[-d debug]\n",
-                             argv[0]),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-main (int argc, ASYS_TCHAR *argv[])
-{
-  int result = parse_args (argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  move_to_rt_class ();
-  ACE_High_Res_Timer::calibrate ();
-
-  ACE_SYNCH_MUTEX mutex;
-  ACE_SYNCH_CONDITION condition (mutex);
-
-  // Leader Followers.
-  Leader_Follower_Task **leader_followers = 0;
-  ACE_NEW_RETURN (leader_followers,
-                  Leader_Follower_Task *[number_of_threads],
-                  -1);
-
-  ACE_Rusage begin_rusage;
-  ACE_OS::getrusage (RUSAGE_SELF, &begin_rusage);
-
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) +
-     ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
-  long flags = THR_BOUND | THR_SCHED_FIFO;
-
-  // Create and activate them.
-  size_t i;
-  for (i = 0; i < number_of_threads; ++i)
-    {
-      ACE_NEW_RETURN (leader_followers[i],
-                      Leader_Follower_Task (mutex,
-                                            condition),
-                      -1);
-
-      // Activate the leader_followers.
-      result = leader_followers[i]->activate (flags,
-                                              1,
-                                              1,
-                                              priority);
-      if (result != 0)
-        {
-          flags = THR_BOUND;
-          priority = ACE_Sched_Params::priority_min (ACE_SCHED_OTHER,
-                                                     ACE_SCOPE_THREAD);
-          result = leader_followers[i]->activate (flags,
-                                                  1,
-                                                  1,
-                                                  priority);
-          if (result != 0)
-            {
-              return result;
-            }
-        }
-    }
-
-  // Wait for all threads to terminate.
-  result = ACE_Thread_Manager::instance ()->wait ();
-
-  ACE_Rusage end_rusage;
-  ACE_OS::getrusage (RUSAGE_SELF, &end_rusage);
-
-  Latency_Stats latency;
-  Throughput_Stats throughput;
-  for (i = 0; i < number_of_threads; ++i)
-    {
-      latency.accumulate (leader_followers[i]->latency_stats_);
-      throughput.accumulate (leader_followers[i]->throughput_stats_);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "\nTotals for latency:\n"));
-  latency.dump_results (argv[0], "latency");
-
-  ACE_DEBUG ((LM_DEBUG, "\nTotals for throughput:\n"));
-  throughput.dump_results (argv[0], "throughput");
-
-  ACE_DEBUG ((LM_DEBUG, "\nRusage %d/%d\n",
-              end_rusage.ru_nvcsw - begin_rusage.ru_nvcsw,
-              end_rusage.ru_nivcsw - begin_rusage.ru_nivcsw));
-
-  for (i = 0; i < number_of_threads; ++i)
-    {
-      delete leader_followers[i];
-    }
-  delete[] leader_followers;
-
-  return result;
-}
diff --git a/performance-tests/Server_Concurrency/Makefile b/performance-tests/Server_Concurrency/Makefile
deleted file mode 100644
index f12b17e7a0e..00000000000
--- a/performance-tests/Server_Concurrency/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id$
-#
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = Queue_Based_Workers \
-	Leader_Follower
-
-#----------------------------------------------------------------------------
-#	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/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile b/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile
deleted file mode 100644
index 689bfb40dd5..00000000000
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# $Id$
-#
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-BIN     = workers
-
-FILES   = $(BIN)
-PSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-CPPFLAGS += -I..
-
-BUILD   = $(VOBJS) $(VBIN)
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/workers.o .obj/workers.so .shobj/workers.o .shobj/workers.so: workers.cpp \
- $(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 \
- $(ACE_ROOT)/ace/config-sunos5.5.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/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/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.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 \
- ../Latency_Stats.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp b/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp
deleted file mode 100644
index f2104b1bbea..00000000000
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Queue_Based_Workers" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=Queue_Based_Workers - 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 "Queue_Based_Workers.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 "Queue_Based_Workers.mak" CFG="Queue_Based_Workers - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "Queue_Based_Workers - 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)" == "Queue_Based_Workers - 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 "..\..\.." /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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Queue_Based_Workers - 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 "..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Queue_Based_Workers - Win32 Release"

-# Name "Queue_Based_Workers - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\workers.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/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsw b/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.dsw
deleted file mode 100644
index 43794eb03f9..00000000000
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Queue_Based_Workers.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: "Queue_Based_Workers"=".\Queue_Based_Workers.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

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

-

diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
deleted file mode 100644
index 8f404a9009e..00000000000
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+++ /dev/null
@@ -1,397 +0,0 @@
-// $Id$
-
-#include "ace/Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "../Latency_Stats.h"
-
-static size_t number_of_messages = 100;
-static size_t message_size = 100;
-static size_t number_of_workers = 10;
-static size_t burst_size = 10;
-static size_t timeout_between_bursts = 1;
-
-enum DEBUGGING_RANGE
-{
-  NONE = 0,
-  DEFAULT = 1,
-  PRINT_INDIVIDUAL_LATENCY = 2
-};
-
-static DEBUGGING_RANGE debug = NONE;
-
-static ACE_Data_Block *data_block = 0;
-
-class Message_Block : public ACE_Message_Block
-{
-public:
-  Message_Block (ACE_Data_Block *data_block,
-                 ACE_hrtime_t start_of_burst);
-
-  ACE_hrtime_t start_of_burst_;
-};
-
-Message_Block::Message_Block (ACE_Data_Block *data_block,
-                              ACE_hrtime_t start_of_burst)
-  : ACE_Message_Block (data_block),
-    start_of_burst_ (start_of_burst)
-{
-}
-
-typedef ACE_Task<ACE_MT_SYNCH> TASK;
-
-class Worker_Task : public TASK
-{
-public:
-  Worker_Task (ACE_Message_Queue<ACE_MT_SYNCH> *mq);
-  int svc (void);
-
-  size_t messages_dequeued_;
-
-  Latency_Stats latency_stats_;
-  Throughput_Stats throughput_stats_;
-};
-
-class IO_Task : public TASK
-{
-public:
-  IO_Task (ACE_Message_Queue<ACE_MT_SYNCH> *mq);
-  int svc (void);
-};
-
-Worker_Task::Worker_Task (ACE_Message_Queue<ACE_MT_SYNCH> *mq)
-  : TASK (0, mq),
-    messages_dequeued_ (0)
-{
-}
-
-int
-Worker_Task::svc (void)
-{
-  for (;;)
-    {
-      ACE_Message_Block *mb = 0;
-      int result = this->getq (mb);
-      if (result == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Worker_Task::svc (%t) -> %p\n",
-                             "getq error"),
-                            -1);
-        }
-
-      ACE_Message_Block::ACE_Message_Type message_type =
-        mb->msg_type ();
-
-      // If STOP message, break loop and end the task.
-      if (message_type == ACE_Message_Block::MB_STOP)
-        {
-          if (debug)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%t) stop message dequeued after %d data messages\n",
-                          this->messages_dequeued_));
-            }
-
-          mb->release ();
-          break;
-        }
-
-      Message_Block *message_block =
-        ACE_dynamic_cast (Message_Block *, mb);
-
-      ACE_hrtime_t start_of_burst_for_this_message_block =
-        message_block->start_of_burst_;
-
-      mb->release ();
-
-      // Counter.
-      ++this->messages_dequeued_;
-
-      if (debug)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%t) dequeued its %d message\n",
-                      this->messages_dequeued_));
-        }
-
-      //
-      // Process message here.
-      //
-
-      for (size_t j = 0; j < message_size; ++j)
-        {
-          // Eat a little CPU
-          /* takes about 40.2 usecs on a 167 MHz Ultra2 */
-          u_long n = 11UL;
-          ACE::is_prime (n, 2, n / 2);
-        }
-
-      //
-      // Record stats for this message.
-      //
-      ACE_hrtime_t latency_from_start_of_burst =
-        ACE_OS::gethrtime () - start_of_burst_for_this_message_block;
-      this->latency_stats_.sample (latency_from_start_of_burst);
-
-      this->throughput_stats_.sample ();
-
-      if (debug >= PRINT_INDIVIDUAL_LATENCY)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%t) latency from start of burst: %Q\n",
-                      latency_from_start_of_burst));
-        }
-    }
-
-  return 0;
-}
-
-IO_Task::IO_Task (ACE_Message_Queue<ACE_MT_SYNCH> *mq)
-  : TASK (0, mq)
-{
-}
-
-int
-IO_Task::svc (void)
-{
-  size_t i = 0;
-  size_t messages_queued = 1;
-  size_t burst = 1;
-
-  // Data messages.
-  while (number_of_messages > 0)
-    {
-      ACE_hrtime_t start_of_burst = ACE_OS::gethrtime ();
-
-      for (i = 1;
-           i <= burst_size && number_of_messages > 0;
-           ++i, --number_of_messages, ++messages_queued)
-        {
-          if (debug)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%t) IO thread -> burst %d: message %d; overall message %d\n",
-                          burst,
-                          i,
-                          messages_queued));
-            }
-
-          Message_Block *message_block = 0;
-          ACE_NEW_RETURN (message_block,
-                          Message_Block (data_block,
-                                         start_of_burst),
-                          -1);
-
-          int result = this->putq (message_block);
-          if (result == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "IO::svc (%t) -> %p\n",
-                                 "putq error"),
-                                -1);
-            }
-        }
-
-      ++burst;
-      ACE_OS::sleep (timeout_between_bursts);
-    }
-
-  // Terminate messages.
-  for (i = 0; i < number_of_workers; ++i)
-    {
-      ACE_Message_Block *message_block = 0;
-      ACE_NEW_RETURN (message_block,
-                      ACE_Message_Block ((size_t)0,
-                                         (int)ACE_Message_Block::MB_STOP),
-                      -1);
-
-      int result = this->putq (message_block);
-      if (result == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "IO::svc (%t) -> %p\n",
-                             "putq error"),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-static int
-parse_args (int argc, ASYS_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("m:s:w:b:t:d:"));
-  int c;
-
-  while ((c = get_opt ()) != -1)
-    {
-      switch (c)
-        {
-        case 'm':
-          number_of_messages = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 's':
-          message_size = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'w':
-          number_of_workers = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'b':
-          burst_size = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 't':
-          timeout_between_bursts = ACE_OS::atoi (get_opt.optarg);
-          break;
-        case 'd':
-          debug = ACE_static_cast (DEBUGGING_RANGE, ACE_OS::atoi (get_opt.optarg));
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "usage: %s\n"
-                             "\t[-m number of messages]\n"
-                             "\t[-s message size]\n"
-                             "\t[-w number of workers]\n"
-                             "\t[-b burst size]\n"
-                             "\t[-t timeout between bursts]\n"
-                             "\t[-d debug]\n",
-                             argv[0]),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-main (int argc, ASYS_TCHAR *argv[])
-{
-  int result = parse_args (argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  move_to_rt_class ();
-  ACE_High_Res_Timer::calibrate ();
-
-  size_t i = 0;
-
-  ACE_NEW_RETURN (data_block,
-                  ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >,
-                  -1);
-
-  for (i = 0; i < number_of_messages; ++i)
-    {
-      data_block->duplicate ();
-    }
-
-  ACE_Message_Queue<ACE_MT_SYNCH> message_queue;
-
-  // Workers.
-  Worker_Task **workers = 0;
-  ACE_NEW_RETURN (workers,
-                  Worker_Task *[number_of_workers],
-                  -1);
-
-  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);
-
-  long flags = THR_BOUND | THR_SCHED_FIFO;
-
-  // Create and activate them.
-  for (i = 0; i < number_of_workers; ++i)
-    {
-      ACE_NEW_RETURN (workers[i],
-                      Worker_Task (&message_queue),
-                      -1);
-
-      // Activate the workers.
-      result = workers[i]->activate (flags,
-                                     1,
-                                     1,
-                                     priority);
-      if (result != 0)
-        {
-          flags = THR_BOUND;
-          priority = ACE_Sched_Params::priority_min (ACE_SCHED_OTHER,
-                                                     ACE_SCOPE_THREAD);
-          result = workers[i]->activate (flags,
-                                         1,
-                                         1,
-                                         priority);
-          if (result != 0)
-            {
-              return result;
-            }
-        }
-    }
-
-  // IO Task.
-  IO_Task io (&message_queue);
-
-  // Activate the workers.
-  priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) +
-     ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
-  flags = THR_BOUND | THR_SCHED_FIFO;
-
-  result = io.activate (THR_BOUND);
-  if (result != 0)
-    {
-      flags = THR_BOUND;
-      priority = ACE_Sched_Params::priority_min (ACE_SCHED_OTHER,
-                                                 ACE_SCOPE_THREAD);
-      result = io.activate (flags,
-                            1,
-                            1,
-                            priority);
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  // Wait for all threads to terminate.
-  result = ACE_Thread_Manager::instance ()->wait ();
-
-  Latency_Stats latency;
-  Throughput_Stats throughput;
-  for (i = 0; i < number_of_workers; ++i)
-    {
-      latency.accumulate (workers[i]->latency_stats_);
-      throughput.accumulate (workers[i]->throughput_stats_);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "\nTotals for latency:\n"));
-  latency.dump_results (argv[0], "latency");
-
-  ACE_DEBUG ((LM_DEBUG, "\nTotals for throughput:\n"));
-  throughput.dump_results (argv[0], "throughput");
-
-  for (i = 0; i < number_of_workers; ++i)
-    {
-      delete workers[i];
-    }
-  delete[] workers;
-  delete data_block;
-
-  return result;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >;
-template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/performance-tests/Server_Concurrency/Server_Concurrency.dsw b/performance-tests/Server_Concurrency/Server_Concurrency.dsw
deleted file mode 100644
index 109214ddd0b..00000000000
--- a/performance-tests/Server_Concurrency/Server_Concurrency.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: "Leader_Follower"=".\Leader_Follower\Leader_Follower.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

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

-

diff --git a/performance-tests/Server_Concurrency/run_test.sh b/performance-tests/Server_Concurrency/run_test.sh
deleted file mode 100755
index 0f45ca8f11a..00000000000
--- a/performance-tests/Server_Concurrency/run_test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-
-for s in 0 25 50 75 100; do
-  for w in 1 2 3 4 5 6; do
-    echo ================ WORK: $s 1>&2
-    echo ================ THREADS: $w 1>&2
-    ./Queue_Based_Workers/workers -m 100000 -b 100000 -s $s -w $w
-    ./Leader_Follower/leader_follower -m 100000 -b 100000 -s $s -w $w
-  done
-done
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/Conn_Test.cpp b/tests/Conn_Test.cpp
index 46a23e23a31..1d38280f55a 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -175,6 +175,8 @@ Svc_Handler::idle (u_long flags)
   return ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::idle (flags);
 }
 
+// ****************************************
+
 // The following works around bugs with some operating systems, which
 // don't allow multiple threads/process to call accept() on the same
 // listen-mode port/socket.
@@ -226,9 +228,7 @@ timed_blocking_connect (CONNECTOR &con,
   // Perform a timed-blocking connect to the server (this should
   // connect quickly since we're in the same address space or same
   // host).
-  if (con.connect (svc_handler,
-                   server_addr,
-                   options) == -1)
+  if (con.connect (svc_handler, server_addr, options) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("(%P|%t) %p\n"),
                 ASYS_TEXT ("connection failed")));
@@ -254,8 +254,7 @@ blocking_connect (CONNECTOR &con,
            Svc_Handler);
 
   // Perform a blocking connect to the server.
-  if (con.connect (svc_handler,
-                   server_addr) == -1)
+  if (con.connect (svc_handler, server_addr) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("(%P|%t) %p\n"),
                 ASYS_TEXT ("connection failed")));
@@ -288,8 +287,7 @@ cached_connect (STRAT_CONNECTOR &con,
       // connecting to the same <server_addr> these calls will return
       // the same dynamically allocated <Svc_Handler> for each
       // <connect>.
-      if (con.connect (svc_handler,
-                       server_addr) == -1)
+      if (con.connect (svc_handler, server_addr) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       ASYS_TEXT ("(%P|%t) %p\n"),
@@ -362,6 +360,7 @@ client_connections (void *arg)
               ASYS_TEXT ("(%P|%t) **** starting cached blocking connect\n")));
   cached_connect (*info->strat_connector_,
                   *info->server_addr_);
+
   return 0;
 }
 
@@ -467,10 +466,12 @@ server (void *arg)
               return 0;
             }
           else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ASYS_TEXT ("(%P|%t) %p\n"),
-                               ASYS_TEXT ("accept failed, shutting down")),
-                              0);
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ASYS_TEXT ("(%P|%t) %p\n"),
+                                 ASYS_TEXT ("accept failed, shutting down")),
+                                0);
+            }
         }
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("(%P|%t) client %s connected from %d\n"),
@@ -572,19 +573,14 @@ spawn_threads (ACCEPTOR *acceptor,
 #if defined (VXWORKS)
   // Assign thread (VxWorks task) names to test that feature.
   ACE_thread_t *server_name;
-  ACE_NEW_RETURN (server_name,
-                  ACE_thread_t[n_servers],
-                  -1);
+  ACE_NEW_RETURN (server_name, ACE_thread_t[n_servers], -1);
 
   // And test ability to provide stacks.
   size_t *stack_size;
-  ACE_NEW_RETURN (stack_size,
-                  size_t[n_servers],
-                  -1);
+  ACE_NEW_RETURN (stack_size, size_t[n_servers], -1);
   char **stack;
-  ACE_NEW_RETURN (stack,
-                  char *[n_servers],
-                  -1);
+  ACE_NEW_RETURN (stack, char *[n_servers], -1);
+
   int i;
 
   for (i = 0; i < n_servers; ++i)
@@ -705,12 +701,10 @@ main (int argc, ASYS_TCHAR *argv[])
     {
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("(%P|%t) starting server at port %d\n"),
-
                   server_addr.get_port_number ()));
 
 #if !defined (ACE_LACKS_FORK)
-      if (spawn_processes (&acceptor,
-                           &server_addr) == -1)
+      if (spawn_processes (&acceptor, &server_addr) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ASYS_TEXT ("(%P|%r) %p\n"),
                            ASYS_TEXT ("spawn_processes")),
@@ -719,8 +713,7 @@ main (int argc, ASYS_TCHAR *argv[])
       status = spawn_threads (&acceptor, &server_addr);
 #else  /* ACE_LACKS_FORK && ! ACE_HAS_THREADS */
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), 
-                  1));
+                  ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), 1));
 #endif /* ACE_LACKS_FORK && ! ACE_HAS_THREADS */
     }
 
diff --git a/tests/DLList_Test.cpp b/tests/DLList_Test.cpp
index 22a739b5851..006502b18d1 100644
--- a/tests/DLList_Test.cpp
+++ b/tests/DLList_Test.cpp
@@ -116,18 +116,10 @@ main (int, ASYS_TCHAR *[])
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_DLList<STRING>;
-template class ACE_Double_Linked_List_Iterator_Base <ACE_DLList_Node>;
-template class ACE_Double_Linked_List_Iterator <ACE_DLList_Node>;
-template class ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>;
 template class ACE_DLList_Iterator<STRING>;
-template class ACE_DLList_Reverse_Iterator<STRING>;
 template class ACE_Static_Allocator<8192>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_DLList<STRING>
-#pragma instantiate ACE_Double_Linked_List_Iterator_Base <ACE_DLList_Node>
-#pragma instantiate ACE_Double_Linked_List_Iterator <ACE_DLList_Node>
-#pragma instantiate ACE_Double_Linked_List_Reverse_Iterator <ACE_DLList_Node>
 #pragma instantiate ACE_DLList_Iterator<STRING>
-#pragma instantiate ACE_DLList_Reverse_Iterator<STRING>
 #pragma instantiate ACE_Static_Allocator<8192>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Makefile b/tests/Makefile
index 95b85bc306f..78ba03fbcc6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -64,7 +64,6 @@ BIN =   Aio_Platform_Test \
         SPIPE_Test \
         SString_Test \
         SV_Shared_Memory_Test \
-        Svc_Handler_Test \
         Task_Test \
         Thread_Manager_Test \
         Thread_Mutex_Test \
@@ -288,7 +287,8 @@ 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 \
@@ -720,7 +720,8 @@ 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 \
@@ -1631,27 +1632,7 @@ realclean: clean
  $(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 \
- $(ACE_ROOT)/ace/Hash_Cache_Map_Manager_T.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/Caching_Strategies_T.h \
- $(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 \
- $(ACE_ROOT)/ace/Caching_Strategies_T.i \
- $(ACE_ROOT)/ace/Caching_Strategies_T.cpp
+ $(ACE_ROOT)/ace/Profile_Timer.i
 .obj/Mem_Map_Test.o .obj/Mem_Map_Test.so .shobj/Mem_Map_Test.o .shobj/Mem_Map_Test.so: Mem_Map_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -3500,7 +3481,8 @@ 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 \
@@ -4638,144 +4620,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
-.obj/Svc_Handler_Test.o .obj/Svc_Handler_Test.so .shobj/Svc_Handler_Test.o .shobj/Svc_Handler_Test.so: Svc_Handler_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/FILE_Connector.h \
- $(ACE_ROOT)/ace/FILE_IO.h \
- $(ACE_ROOT)/ace/FILE.h \
- $(ACE_ROOT)/ace/IO_SAP.h \
- $(ACE_ROOT)/ace/IO_SAP.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.i \
- $(ACE_ROOT)/ace/FILE_IO.i \
- $(ACE_ROOT)/ace/FILE_Connector.i \
- $(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/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/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/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/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/Dynamic.i
 .obj/Task_Test.o .obj/Task_Test.so .shobj/Task_Test.o .shobj/Task_Test.so: Task_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -5657,488 +5501,5 @@ realclean: clean
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Profile_Timer.i
-.obj/Naming_Test.o .obj/Naming_Test.so .shobj/Naming_Test.o .shobj/Naming_Test.so: Naming_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/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Naming_Context.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/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/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Name_Proxy.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_Connector.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_Connector.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(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/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i
-.obj/Thread_Pool_Reactor_Test.o .obj/Thread_Pool_Reactor_Test.so .shobj/Thread_Pool_Reactor_Test.o .shobj/Thread_Pool_Reactor_Test.so: Thread_Pool_Reactor_Test.cpp \
- $(ACE_ROOT)/tests/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/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(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/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 \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(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/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/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/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.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/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/TP_Reactor.i \
- $(ACE_ROOT)/tests/Thread_Pool_Reactor_Test.h
-.obj/XtReactor_Test.o .obj/XtReactor_Test.so .shobj/XtReactor_Test.o .shobj/XtReactor_Test.so: XtReactor_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
-.obj/FlReactor_Test.o .obj/FlReactor_Test.so .shobj/FlReactor_Test.o .shobj/FlReactor_Test.so: FlReactor_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
-.obj/TkReactor_Test.o .obj/TkReactor_Test.so .shobj/TkReactor_Test.o .shobj/TkReactor_Test.so: TkReactor_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
-.obj/Tokens_Test.o .obj/Tokens_Test.so .shobj/Tokens_Test.o .shobj/Tokens_Test.so: Tokens_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/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/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Local_Tokens.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/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/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.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 \
- $(ACE_ROOT)/ace/Local_Tokens.i \
- $(ACE_ROOT)/ace/Token_Collection.h \
- $(ACE_ROOT)/ace/Token_Collection.i \
- $(ACE_ROOT)/ace/Remote_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/SOCK_Connector.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_Connector.i \
- $(ACE_ROOT)/ace/Token_Request_Reply.h \
- $(ACE_ROOT)/ace/Token_Request_Reply.i \
- $(ACE_ROOT)/ace/Remote_Tokens.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Token_Invariants.h \
- $(ACE_ROOT)/ace/Token_Invariants.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp
index b316cd7b260..5d534f52cac 100644
--- a/tests/Map_Manager_Test.cpp
+++ b/tests/Map_Manager_Test.cpp
@@ -14,9 +14,8 @@
 //     and reverse iterators.
 //
 // = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>,
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>, and
-//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//    Irfan Pyarali and Douglas C. Schmidt
+//
 // ============================================================================
 
 #include "test_config.h"
@@ -25,9 +24,6 @@
 #include "ace/Active_Map_Manager.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Synch.h"
-#include "ace/Hash_Cache_Map_Manager_T.h"
-#include "ace/Caching_Strategies_T.h"
-#include "ace/Pair_T.h"
 
 ACE_RCSID(tests, Map_Manager_Test, "$Id$")
 
@@ -38,297 +34,19 @@ USELIB("..\ace\aced.lib");
 
 typedef ACE_Null_Mutex MUTEX;
 typedef size_t TYPE;
-typedef ACE_Active_Map_Manager_Key 
-        ACTIVE_KEY;
-typedef ACE_Hash<TYPE> 
-        HASH_KEY;
-typedef ACE_Equal_To<TYPE> 
-        COMPARE_KEYS;
-
-typedef ACE_Map_Manager <TYPE, TYPE, MUTEX> 
-        MAP_MANAGER;
-typedef ACE_Map_Iterator <TYPE, TYPE, MUTEX> 
-        ITERATOR;
-typedef ACE_Map_Reverse_Iterator <TYPE, TYPE, MUTEX> 
-        REVERSE_ITERATOR;
-typedef ACE_Map_Entry <TYPE, TYPE> 
-        ENTRY;
-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> 
-        HASH_ITERATOR;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> 
-        HASH_REVERSE_ITERATOR;
-typedef ACE_Hash_Map_Entry <TYPE, TYPE> 
-        HASH_ENTRY;
-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>
-        CACHE_MAP_IMPL;
-typedef ACE_Hash_Map_Iterator_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
-        CACHE_ITER_IMPL;
-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_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;
-typedef ACE_Cache_Map_Manager<TYPE, TYPE, CACHE_MAP_IMPL, CACHE_ITER_IMPL, CACHE_REV_ITER_IMPL, NULL_CACHING_STRATEGY, ATTR>
-        CACHE_MAP_MANAGER;
-typedef ACE_Hash_Cache_Map_Manager<TYPE, TYPE, HASH_KEY, COMPARE_KEYS, NULL_CACHING_STRATEGY, ATTR>
-        HASH_CACHE_MAP_MANAGER;
-
-static void
-test_cache_map_manager (size_t table_size,
-                        size_t iterations,
-                        int test_iterators)
-{
-  CACHE_MAP_MANAGER map (table_size);
-  TYPE i;
-  TYPE j;
-  ssize_t k;
-
-  for (i = 0; i < iterations; i++)
-    ACE_ASSERT (map.bind (i, i) != -1);
-
-  if (test_iterators)
-    {
-      {
-        i = 0;
-
-        CACHE_MAP_MANAGER::ITERATOR end = map.end ();
-
-        for (CACHE_MAP_MANAGER::ITERATOR iter = map.begin ();
-             iter != end;
-             ++iter)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("(%d|%d|%d)"),
-                        i,
-                        (*iter).first (),
-                        (*iter).second ()));
-            ++i;
-          }
-
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("\n")));
-        ACE_ASSERT (i == iterations);
-      }
-
-
-      {
-        k = iterations - 1;
-
-        CACHE_MAP_MANAGER::REVERSE_ITERATOR rend = map.rend ();
-
-        for (CACHE_MAP_MANAGER::REVERSE_ITERATOR iter = map.rbegin ();
-             iter != rend;
-             ++iter)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("(%d|%d|%d)"),
-                        k,
-                        (*iter).first (),
-                        (*iter).second ()));
-            k--;
-          }
-
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("\n")));
-        ACE_ASSERT (k == -1);
-      }
-
-
-      {
-        i = 0;
-
-        CACHE_MAP_MANAGER::iterator end = map.end ();
-
-        for (CACHE_MAP_MANAGER::iterator iter = map.begin ();
-             iter != end;
-             ++iter)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("(%d|%d|%d)"),
-                        i,
-                        (*iter).first (),
-                        (*iter).second ()));
-            ++i;
-          }
-
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("\n")));
-        ACE_ASSERT (i == iterations);
-      }
-
-
-      {
-        k = iterations - 1;
-
-        CACHE_MAP_MANAGER::reverse_iterator rend = map.rend ();
-
-        for (CACHE_MAP_MANAGER::reverse_iterator iter = map.rbegin ();
-             iter != rend;
-             ++iter)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("(%d|%d|%d)"),
-                        k,
-                        (*iter).first (),
-                        (*iter).second ()));
-            k--;
-          }
-
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("\n")));
-        ACE_ASSERT (k == -1);
-      }
-
-
-    }
-
-  for (i = 0; i < iterations; ++i)
-    {
-      ACE_ASSERT (map.find (i, j) != -1);
-      ACE_ASSERT (i == j);
-    }
-
-  size_t remaining_entries = iterations;
-  for (i = 0; i < iterations; ++i)
-    {
-      ACE_ASSERT (map.unbind (i) != -1);
-      --remaining_entries;
-      ACE_ASSERT (map.current_size () == remaining_entries);
-    }
-
-}
-
-static void
-test_hash_cache_map_manager (size_t table_size,
-                             size_t iterations,
-                             int test_iterators)
-{
-  HASH_CACHE_MAP_MANAGER map (table_size);
-  TYPE i;
-  TYPE j;
-  ssize_t k;
-
-  for (i = 0; i < iterations; i++)
-    ACE_ASSERT (map.bind (i, i) != -1);
-
-  if (test_iterators)
-    {
-      {
-        i = 0;
-
-        HASH_CACHE_MAP_MANAGER::ITERATOR end = map.end ();
-
-        for (HASH_CACHE_MAP_MANAGER::ITERATOR iter = map.begin ();
-             iter != end;
-             ++iter)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("(%d|%d|%d)"),
-                        i,
-                        (*iter).first (),
-                        (*iter).second ()));
-            ++i;
-          }
-
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("\n")));
-        ACE_ASSERT (i == iterations);
-      }
-
-
-      {
-        k = iterations - 1;
-
-        HASH_CACHE_MAP_MANAGER::REVERSE_ITERATOR rend = map.rend ();
-
-        for (HASH_CACHE_MAP_MANAGER::REVERSE_ITERATOR iter = map.rbegin ();
-             iter != rend;
-             ++iter)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("(%d|%d|%d)"),
-                        k,
-                        (*iter).first (),
-                        (*iter).second ()));
-            k--;
-          }
-
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("\n")));
-        ACE_ASSERT (k == -1);
-      }
-
-
-      {
-        i = 0;
-
-        HASH_CACHE_MAP_MANAGER::iterator end = map.end ();
-
-        for (HASH_CACHE_MAP_MANAGER::iterator iter = map.begin ();
-             iter != end;
-             ++iter)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("(%d|%d|%d)"),
-                        i,
-                        (*iter).first (),
-                        (*iter).second ()));
-            ++i;
-          }
-
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("\n")));
-        ACE_ASSERT (i == iterations);
-      }
-
-
-      {
-        k = iterations - 1;
-
-        HASH_CACHE_MAP_MANAGER::reverse_iterator rend = map.rend ();
-
-        for (HASH_CACHE_MAP_MANAGER::reverse_iterator iter = map.rbegin ();
-             iter != rend;
-             ++iter)
-          {
-            ACE_DEBUG ((LM_DEBUG,
-                        ASYS_TEXT ("(%d|%d|%d)"),
-                        k,
-                        (*iter).first (),
-                        (*iter).second ()));
-            k--;
-          }
-
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("\n")));
-        ACE_ASSERT (k == -1);
-      }
-
-
-    }
-
-  for (i = 0; i < iterations; ++i)
-    {
-      ACE_ASSERT (map.find (i, j) != -1);
-      ACE_ASSERT (i == j);
-    }
-
-  size_t remaining_entries = iterations;
-  for (i = 0; i < iterations; ++i)
-    {
-      ACE_ASSERT (map.unbind (i) != -1);
-      --remaining_entries;
-      ACE_ASSERT (map.current_size () == remaining_entries);
-    }
-}
-
+typedef ACE_Active_Map_Manager_Key ACTIVE_KEY;
+typedef ACE_Hash<TYPE> HASH_KEY;
+typedef ACE_Equal_To<TYPE> COMPARE_KEYS;
+
+typedef ACE_Map_Manager <TYPE, TYPE, MUTEX> MAP_MANAGER;
+typedef ACE_Map_Iterator <TYPE, TYPE, MUTEX> ITERATOR;
+typedef ACE_Map_Reverse_Iterator <TYPE, TYPE, MUTEX> REVERSE_ITERATOR;
+typedef ACE_Map_Entry <TYPE, TYPE> ENTRY;
+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> HASH_ITERATOR;
+typedef ACE_Hash_Map_Reverse_Iterator_Ex <TYPE, TYPE, HASH_KEY, COMPARE_KEYS, MUTEX> HASH_REVERSE_ITERATOR;
+typedef ACE_Hash_Map_Entry <TYPE, TYPE> HASH_ENTRY;
+typedef ACE_Active_Map_Manager <TYPE> ACTIVE_MAP_MANAGER;
 
 static void
 test_active_map_manager (size_t table_size,
@@ -906,26 +624,12 @@ main (int argc, ASYS_TCHAR *argv[])
             test_iterators,
             ASYS_TEXT ("Active_Map_Manager"));
 
-  // Test the <ACE_Cache_Map_Manager>.
-  run_test (&test_cache_map_manager,
-            table_size,
-            iterations,
-            test_iterators,
-            ASYS_TEXT ("Cache_Map_Manager"));
-
-  // Test the <ACE_Hash_Cache_Map_Manager>.
-  run_test (&test_hash_cache_map_manager,
-            table_size,
-            iterations,
-            test_iterators,
-            ASYS_TEXT ("Hash_Cache_Map_Manager"));
   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<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>;
@@ -943,21 +647,7 @@ 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_Entry<TYPE, ACE_Pair<TYPE, 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_Pair<TYPE, ATTR >
 #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>
@@ -975,17 +665,4 @@ template class ACE_Cache_Map_Reverse_Iterator<size_t,size_t,ACE_Hash_Map_Reverse
 #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_Entry<TYPE, ACE_Pair<TYPE, 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/RB_Tree_Test.cpp b/tests/RB_Tree_Test.cpp
index 0ee92282087..a5edd805bd2 100644
--- a/tests/RB_Tree_Test.cpp
+++ b/tests/RB_Tree_Test.cpp
@@ -9,17 +9,15 @@
 //    RB_Tree_Test.cpp
 //
 // = DESCRIPTION
-//    This is a test to verify and illustrate the use of the
-//    ACE_RB_Tree ACE_RB_Tree_Iterator, and
-//    ACE_RB_Tree_Reverse_Iterator classes.  Two different key and
-//    item types are used in order to demonstrate specialization of
-//    the ACE_Less_Than comparison function object template: int (for
-//    which the native < operator is sufficient), and const char *
-//    (for which < operator semantics must be replaced by strcmp
-//    semantics).  An RB tree for each of the four possible type
-//    parameter permutations over int and const char * is constructed
-//    and filled in, and the resulting order is checked via an
-//    iterator over each.
+//    This is a test to verify and illustrate the use of the ACE_RB_Tree
+//    and ACE_RB_Tree_Iterator classes.  Two different key and item types are
+//    used in order to demonstrate specialization of the ACE_Less_Than
+//    comparison function object template: int (for which the native <
+//    operator is sufficient), and char * (for which < operator semantics must
+//    be replaced by strcmp semantics).  An RB tree for each of the four
+//    possible type parameter permutations over int and char * is constructed
+//    and filled in, and the resulting order is checked via an iterator over
+//    each.
 //
 // = AUTHOR
 //    Chris Gill <cdgill@cs.wustl.edu>
@@ -28,7 +26,6 @@
 
 #include "test_config.h" /* Include first to enable ACE_ASSERT. */
 #include "ace/RB_Tree.h"
-#include "RB_Tree_Test.h"
 
 ACE_RCSID(tests, RB_Tree_Test, "$Id$")
 
@@ -37,306 +34,450 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
-// Type definitions for the four distinct parameterizations of the
-// test.
+// These arrays of numbers as ints and character strings
+// are used to instantiate key and item nodes in the tree.
 
-typedef ACE_RB_Tree_Test<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> INT_INT_RB_TREE_TEST;
-typedef ACE_RB_Tree_Test<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex> INT_STR_RB_TREE_TEST;
-typedef ACE_RB_Tree_Test<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex> STR_INT_RB_TREE_TEST;
-typedef ACE_RB_Tree_Test<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex> STR_STR_RB_TREE_TEST;
-
-// Number of entries placed in each tree.
-static int RB_TREE_TEST_ENTRIES = 8;
-
-// These arrays of numbers as ints and character strings are used to
-// instantiate key and item arrays in the tests.
-static const char *number_strings [] =
+// @@ Chris, the following should be a "const char *" not a "char *".
+static char *number_strings [] =
 {
   "10", "20", "30", "40", "50", "60", "70", "80"
 };
 
-static int number_integers [] =
+static int number_integers [] = 
 {
   10, 20, 30, 40, 50, 60, 70, 80
 };
 
-// These arrays of ints are used to shuffle the order of insertion and
-// deletaion of keys and items for the various tests.
+// These arrays of ints are used to shuffle the order of insertion
+// of keys and items for the various trees.
 static int int_int_index [] = {0, 1, 2, 3, 4, 5, 6, 7}; // LR inorder
 static int int_str_index [] = {7, 6, 5, 4, 3, 2, 1, 0}; // RL inorder
 static int str_int_index [] = {4, 6, 2, 7, 5, 3, 1, 0}; // RL BFS
 static int str_str_index [] = {4, 2, 1, 0, 3, 6, 5, 7}; // LR preorder
 
+// Number of entries placed in each tree.
+static int RB_TREE_TEST_ENTRIES = 8;
+
 int
 main (int, ASYS_TCHAR *[])
 {
   ACE_START_TEST (ASYS_TEXT ("RB_Tree_Test"));
 
-  // Construct and run four distinctly parameterized tests.  Note that
-  // specialization of the ACE_Less_Than template for character
-  // strings performs strcmp style string comparisons rather than <
-  // operator comparison of the const char * pointers themselves.
-
-  INT_INT_RB_TREE_TEST int_int_test (RB_TREE_TEST_ENTRIES,
-                                     number_integers,
-                                     number_integers,
-                                     int_int_index);
-  INT_STR_RB_TREE_TEST int_str_test (RB_TREE_TEST_ENTRIES,
-                                     number_integers,
-                                     number_strings,
-                                     int_str_index);
-  STR_INT_RB_TREE_TEST str_int_test (RB_TREE_TEST_ENTRIES,
-                                     number_strings,
-                                     number_integers,
-                                     str_int_index);
-  STR_STR_RB_TREE_TEST str_str_test (RB_TREE_TEST_ENTRIES,
-                                     number_strings,
-                                     number_strings,
-                                     str_str_index);
-  int_int_test.run_test ();
-  int_str_test.run_test ();
-  str_int_test.run_test ();
-  str_str_test.run_test ();
+  // @@ Chris, this function is WAY, WAY, WAY too long, which makes it
+  // impossible to tell what's going on...  Please break it up into a
+  // number of smaller functions.
 
-  ACE_END_TEST;
-  return 0;
-}
+  // Local variables used to index arrays.
+  int i;
+  int k;
 
-// Constructor.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Test
-  (int entry_count,
-   EXT_ID key_array [],
-   INT_ID item_array [],
-   int order_index [])
-  : stable_fwd_iter_ (stable_tree_),
-    stable_rev_iter_ (stable_tree_),
-    deprecated_fwd_iter_ (deprecated_tree_),
-    deprecated_rev_iter_ (deprecated_tree_),
-    entry_count_ (entry_count),
-    key_array_ (key_array),
-    item_array_ (item_array),
-    order_index_ (order_index)
-{
-}
+  // Construct eight RB_Trees.  Specialization of the ACE_Less_Than
+  // template for character strings performs strcmp style string
+  // comparisons rather than < operator comparison of the pointers
+  // themselves.
 
-// Destructor.
+  // @@ Chris, the following definitions are (1) not const-correct,
+  // (2) should be factored out into typedefs so that the code is
+  // readable, and (3) each variable should be defined 1 per line.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Test (void)
-{
-}
+  ACE_RB_Tree<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_tree1, int_int_tree2;
+  ACE_RB_Tree<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_tree1, int_str_tree2;
+  ACE_RB_Tree<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_tree1, str_int_tree2;
+  ACE_RB_Tree<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_tree1, str_str_tree2;
 
-// Run the interface and iteration tests.
+  // First, test the new ACE_Hash_Map_Manager_Ex compliant interface.
+  // Fill in each tree with the key and item from the appropriate
+  // arrays, using the shuffle indexes to create different insertion
+  // orders.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::run_test (void)
-{
-  // Run the individual portions of the test, in order.
+  for (i = 0;
+       i < RB_TREE_TEST_ENTRIES;
+       ++i)
+    {
+      char *str_item;
+      int int_item;
+
+      k = int_int_index [i];
+      ACE_ASSERT (k >= 0 && k < RB_TREE_TEST_ENTRIES);
+      int_item = -1;
+      // @@ Chris, shouldn't you be checking return values here to
+      // make sure this call worked (same for all calls below)?
+      int_int_tree1.insert (number_integers [k],
+                            number_integers [k]);
+      ACE_ASSERT (int_int_tree1.find (number_integers [k], int_item) == 0
+                  && int_item == number_integers [k]);
+
+      k = int_str_index [i];
+      ACE_ASSERT (k >= 0 && k < RB_TREE_TEST_ENTRIES);
+      str_item = 0;
+      int_str_tree1.insert (number_integers [k],
+                            number_strings [k]);
+      ACE_ASSERT (int_str_tree1.find (number_integers [k], str_item) == 0
+                  && str_item == number_strings [k]);
+
+      k = str_int_index [i];
+      ACE_ASSERT (k >= 0 && k < RB_TREE_TEST_ENTRIES);
+      int_item = -1;
+      str_int_tree1.insert (number_strings [k], number_integers [k]);
+      ACE_ASSERT (str_int_tree1.find (number_strings [k], int_item) == 0
+                  && int_item == number_integers [k]);
+
+      k = str_str_index [i];
+      ACE_ASSERT (k >= 0 && k < RB_TREE_TEST_ENTRIES);
+      str_item = 0;
+      str_str_tree1.insert (number_strings [k], 
+                            number_strings [k]);
+      ACE_ASSERT (str_str_tree1.find (number_strings [k], str_item) == 0
+                  && str_item == number_strings [k]);
+    }
 
-  test_tree_insertion ();
-  test_post_insertion_iteration ();
-  test_tree_deletion ();
-  test_post_deletion_iteration ();
-}
 
+  // Second, test the deprecated interface.  This portion of the test
+  // will go away when the deprecated interface is removed Fill in
+  // each tree with the key and item from the appropriate arrays,
+  // using the shuffle indexes to create different insertion orders.
+  for (i = 0;
+       i < RB_TREE_TEST_ENTRIES;
+       ++i)
+    {
+      k = int_int_index [i];
+      ACE_ASSERT (k >= 0 && k < RB_TREE_TEST_ENTRIES);
+      int_int_tree2.insert (number_integers [k],
+                            number_integers [k]);
+      ACE_ASSERT (int_int_tree2.find (number_integers [k]) != 0
+                  && *int_int_tree2.find (number_integers [k]) == number_integers [k]);
+
+      k = int_str_index [i];
+      ACE_ASSERT (k >= 0 && k < RB_TREE_TEST_ENTRIES);
+      int_str_tree2.insert (number_integers [k],
+                            number_strings [k]);
+      ACE_ASSERT (int_str_tree2.find (number_integers [k]) != 0
+                  && *int_str_tree2.find (number_integers [k]) == number_strings [k]);
+
+      k = str_int_index [i];
+      ACE_ASSERT (k >= 0 && k < RB_TREE_TEST_ENTRIES);
+      str_int_tree2.insert (number_strings [k],
+                            number_integers [k]);
+      ACE_ASSERT (str_int_tree2.find (number_strings [k]) != 0
+                  && *str_int_tree2.find (number_strings [k]) == number_integers [k]);
+
+      k = str_str_index [i];
+      ACE_ASSERT (k >= 0 && k < RB_TREE_TEST_ENTRIES);
+      str_str_tree2.insert (number_strings [k],
+                            number_strings [k]);
+      ACE_ASSERT (str_str_tree2.find (number_strings [k]) != 0
+                  && *str_str_tree2.find (number_strings [k]) == number_strings [k]);
+    }
 
-// Tests stable and deprecated insertion interfaces.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_insertion (void)
-{
-  // Fill in each tree with the key and item from the appropriate
-  // arrays, using the shuffle index to create the appropriate
-  // insertion orders.  Then, make sure the inserted item can be found
-  // using the insertion key.
+  // Construct a forward and reverse iterator for each of the trees.
 
-  for (int i = 0; i < entry_count_; ++i)
-    {
-      INT_ID item;
-      int k = order_index_ [i];
-      ACE_ASSERT (k >= 0 && k < entry_count_);
-
-      // Test the new stable ACE_Hash_Map_Manager_Ex compliant interface.
-      ACE_ASSERT (stable_tree_.bind (key_array_ [k],
-                                     item_array_ [k]) == 0);
-      ACE_ASSERT (stable_tree_.find (key_array_ [k], item) == 0
-                  && item == item_array_ [k]);
-
-      // Test the deprecated interface.
-      ACE_ASSERT (deprecated_tree_.insert (key_array_ [k],
-                                           item_array_ [k]) != 0);
-      ACE_ASSERT (deprecated_tree_.find (key_array_ [k]) != 0
-                  && *deprecated_tree_.find (key_array_ [k]) ==
-                     item_array_ [k]);
-    }
+  // @@ Chris, these should also be typedef'd at the beginning of the
+  // file and cleaned up to be const-correct.
 
-}
+  ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_iter1 (int_int_tree1);
+  ACE_RB_Tree_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_iter1 (int_str_tree1);
+  ACE_RB_Tree_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_iter1 (str_int_tree1);
+  ACE_RB_Tree_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_iter1 (str_str_tree1);
 
-// Tests forward and reverse iteration after insertion in both trees.
+  ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_rev_iter1 (int_int_tree1);
+  ACE_RB_Tree_Reverse_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_rev_iter1 (int_str_tree1);
+  ACE_RB_Tree_Reverse_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_rev_iter1 (str_int_tree1);
+  ACE_RB_Tree_Reverse_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_rev_iter1 (str_str_tree1);
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_insertion_iteration (void)
-{
-  // Reset iterators.
+  ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_iter2 (int_int_tree2);
+  ACE_RB_Tree_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_iter2 (int_str_tree2);
+  ACE_RB_Tree_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_iter2 (str_int_tree2);
+  ACE_RB_Tree_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_iter2 (str_str_tree2);
 
-  stable_fwd_iter_ = stable_tree_.begin ();
-  stable_rev_iter_ = stable_tree_.rbegin ();
-  deprecated_fwd_iter_ = deprecated_tree_.begin ();
-  deprecated_rev_iter_ = deprecated_tree_.rbegin ();
+  ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_rev_iter2 (int_int_tree2);
+  ACE_RB_Tree_Reverse_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_rev_iter2 (int_str_tree2);
+  ACE_RB_Tree_Reverse_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_rev_iter2 (str_int_tree2);
+  ACE_RB_Tree_Reverse_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_rev_iter2 (str_str_tree2);
 
   // Iterate over each of the trees, making sure their entries are in
   // the same relative order (i.e., the integers and strings represent
   // the same values at each respective position in the tree).
-  for (int i = 0; i < entry_count_; ++i)
+  for (i = 0;
+       i < RB_TREE_TEST_ENTRIES;
+       ++i)
     {
-      INT_ID item;
+      char *str_item;
+      int int_item;
+
+      int_item = (*int_int_iter1).item ();
+      ACE_ASSERT (int_item == number_integers [i]);
+
+      int_item = (*int_int_rev_iter1).item ();
+      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i - 1]);
+
+      int_item = (*str_int_iter1).item ();
+      ACE_ASSERT (int_item == number_integers [i]);
+
+      int_item = (*str_int_rev_iter1).item ();
+      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i - 1]);
+
+      str_item = (*int_str_iter1).item ();
+      ACE_ASSERT (str_item == number_strings [i]);
+
+      str_item = (*int_str_rev_iter1).item ();
+      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i - 1]);
 
-      item = (*stable_fwd_iter_).item ();
-      ACE_ASSERT (item == item_array_ [i]);
+      str_item = (*str_str_iter1).item ();
+      ACE_ASSERT (str_item == number_strings [i]);
 
-      item = (*stable_rev_iter_).item ();
-      ACE_ASSERT (item == item_array_ [entry_count_ - i - 1]);
+      str_item = (*str_str_rev_iter1).item ();
+      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i - 1]);
 
-      item = (*deprecated_fwd_iter_).item ();
-      ACE_ASSERT (item == item_array_ [i]);
+      int_item = (*int_int_iter2).item ();
+      ACE_ASSERT (int_item == number_integers [i]);
 
-      item = (*deprecated_rev_iter_).item ();
-      ACE_ASSERT (item == item_array_ [entry_count_ - i - 1]);
+      int_item = (*int_int_rev_iter2).item ();
+      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i - 1]);
+
+      int_item = (*str_int_iter2).item ();
+      ACE_ASSERT (int_item == number_integers [i]);
+
+      int_item = (*str_int_rev_iter2).item ();
+      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i - 1]);
+
+      str_item = (*int_str_iter2).item ();
+      ACE_ASSERT (str_item == number_strings [i]);
+
+      str_item = (*int_str_rev_iter2).item ();
+      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i - 1]);
+
+      str_item = (*str_str_iter2).item ();
+      ACE_ASSERT (str_item == number_strings [i]);
+
+      str_item = (*str_str_rev_iter2).item ();
+      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i - 1]);
 
       // Advance each iterator.
-      ++stable_fwd_iter_;
-      ++stable_rev_iter_;
-      ++deprecated_fwd_iter_;
-      ++deprecated_rev_iter_;
+      ++int_int_iter1;
+      ++int_str_iter1;
+      ++str_int_iter1;
+      ++str_str_iter1;
+      ++int_int_rev_iter1;
+      ++int_str_rev_iter1;
+      ++str_int_rev_iter1;
+      ++str_str_rev_iter1;
+      ++int_int_iter2;
+      ++int_str_iter2;
+      ++str_int_iter2;
+      ++str_str_iter2;
+      ++int_int_rev_iter2;
+      ++int_str_rev_iter2;
+      ++str_int_rev_iter2;
+      ++str_str_rev_iter2;
     }
 
   // Make sure each item in each tree has been visited
-  ACE_ASSERT (stable_fwd_iter_.done () == 1);
-  ACE_ASSERT (stable_rev_iter_.done () == 1);
-  ACE_ASSERT (deprecated_fwd_iter_.done () == 1);
-  ACE_ASSERT (deprecated_rev_iter_.done () == 1);
-}
-
-// Tests stable and deprecated deletion interfaces.
+  ACE_ASSERT (int_int_iter1.done () == 1);
+  ACE_ASSERT (int_str_iter1.done () == 1);
+  ACE_ASSERT (str_int_iter1.done () == 1);
+  ACE_ASSERT (str_str_iter1.done () == 1);
+  ACE_ASSERT (int_int_rev_iter1.done () == 1);
+  ACE_ASSERT (int_str_rev_iter1.done () == 1);
+  ACE_ASSERT (str_int_rev_iter1.done () == 1);
+  ACE_ASSERT (str_str_rev_iter1.done () == 1);
+  ACE_ASSERT (int_int_iter2.done () == 1);
+  ACE_ASSERT (int_str_iter2.done () == 1);
+  ACE_ASSERT (str_int_iter2.done () == 1);
+  ACE_ASSERT (str_str_iter2.done () == 1);
+  ACE_ASSERT (int_int_rev_iter2.done () == 1);
+  ACE_ASSERT (int_str_rev_iter2.done () == 1);
+  ACE_ASSERT (str_int_rev_iter2.done () == 1);
+  ACE_ASSERT (str_str_rev_iter2.done () == 1);
+
+  // Remove the even numbered entries from each of the trees.  New
+  // interface.
+  for (i = 0;
+       i < RB_TREE_TEST_ENTRIES;
+       i += 2)
+    {
+      ACE_ASSERT (int_int_tree1.unbind (number_integers [i]) == 0);
+      ACE_ASSERT (int_str_tree1.unbind (number_integers [i]) == 0);
+      ACE_ASSERT (str_int_tree1.unbind (number_strings [i]) == 0);
+      ACE_ASSERT (str_str_tree1.unbind (number_strings [i]) == 0);
+    }
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_tree_deletion (void)
-{
   // Remove the even numbered entries from each of the trees.
-
-  for (int i = 0; i < entry_count_; i += 2)
+  // Deprecated interface.
+  for (i = 0;
+       i < RB_TREE_TEST_ENTRIES;
+       i += 2)
     {
-      // Test the new stable ACE_Hash_Map_Manager_Ex compliant
-      // interface.
-      ACE_ASSERT (stable_tree_.unbind (key_array_ [i]) == 0);
-
-      // Test the deprecated interface.
-      ACE_ASSERT (deprecated_tree_.remove (key_array_ [i]) == 1);
+      ACE_ASSERT (int_int_tree2.remove (number_integers [i]) == 1);
+      ACE_ASSERT (int_str_tree2.remove (number_integers [i]) == 1);
+      ACE_ASSERT (str_int_tree2.remove (number_strings [i]) == 1);
+      ACE_ASSERT (str_str_tree2.remove (number_strings [i]) == 1);
     }
-}
 
-// Tests forward and reverse iteration after deletions in both trees.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Test<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_post_deletion_iteration (void)
-{
   // Reset iterators
 
-  stable_fwd_iter_ = stable_tree_.begin ();
-  stable_rev_iter_ = stable_tree_.rbegin ();
-  deprecated_fwd_iter_ = deprecated_tree_.begin ();
-  deprecated_rev_iter_ = deprecated_tree_.rbegin ();
+  int_int_iter1 = int_int_tree1.begin ();
+  int_str_iter1 = int_str_tree1.begin ();
+  str_int_iter1 = str_int_tree1.begin ();
+  str_str_iter1 = str_str_tree1.begin ();
+  int_int_rev_iter1 = int_int_tree1.rbegin ();
+  int_str_rev_iter1 = int_str_tree1.rbegin ();
+  str_int_rev_iter1 = str_int_tree1.rbegin ();
+  str_str_rev_iter1 = str_str_tree1.rbegin ();
+  int_int_iter2 = int_int_tree2.begin ();
+  int_str_iter2 = int_str_tree2.begin ();
+  str_int_iter2 = str_int_tree2.begin ();
+  str_str_iter2 = str_str_tree2.begin ();
+  int_int_rev_iter2 = int_int_tree2.rbegin ();
+  int_str_rev_iter2 = int_str_tree2.rbegin ();
+  str_int_rev_iter2 = str_int_tree2.rbegin ();
+  str_str_rev_iter2 = str_str_tree2.rbegin ();
 
   // Iterate over each of the trees, making sure their entries are
   // still in the same relative order (i.e., the integers and strings
   // represent the same values at each respective position in the
   // tree).
-  for (int i = 1; i < entry_count_; i += 2)
+  for (i = 1;
+       i < RB_TREE_TEST_ENTRIES;
+       i += 2)
     {
-      INT_ID item;
+      char *str_item;
+      int int_item;
 
-      item = (*stable_fwd_iter_).item ();
-      ACE_ASSERT (item == item_array_ [i]);
+      int_item = (*int_int_iter1).item ();
+      ACE_ASSERT (int_item == number_integers [i]);
 
-      item = (*stable_rev_iter_).item ();
-      ACE_ASSERT (item == item_array_ [entry_count_ - i]);
+      int_item = (*int_int_rev_iter1).item ();
+      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i]);
 
-      item = (*deprecated_fwd_iter_).item ();
-      ACE_ASSERT (item == item_array_ [i]);
+      int_item = (*str_int_iter1).item ();
+      ACE_ASSERT (int_item == number_integers [i]);
 
-      item = (*deprecated_rev_iter_).item ();
-      ACE_ASSERT (item == item_array_ [entry_count_ - i]);
+      int_item = (*str_int_rev_iter1).item ();
+      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i]);
+
+      str_item = (*int_str_iter1).item ();
+      ACE_ASSERT (str_item == number_strings [i]);
+
+      str_item = (*int_str_rev_iter1).item ();
+      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i]);
+
+      str_item = (*str_str_iter1).item ();
+      ACE_ASSERT (str_item == number_strings [i]);
+
+      str_item = (*str_str_rev_iter1).item ();
+      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i]);
+
+      int_item = (*int_int_iter2).item ();
+      ACE_ASSERT (int_item == number_integers [i]);
+
+      int_item = (*int_int_rev_iter2).item ();
+      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i]);
+
+      int_item = (*str_int_iter2).item ();
+      ACE_ASSERT (int_item == number_integers [i]);
+
+      int_item = (*str_int_rev_iter2).item ();
+      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i]);
+
+      str_item = (*int_str_iter2).item ();
+      ACE_ASSERT (str_item == number_strings [i]);
+
+      str_item = (*int_str_rev_iter2).item ();
+      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i]);
+
+      str_item = (*str_str_iter2).item ();
+      ACE_ASSERT (str_item == number_strings [i]);
+
+      str_item = (*str_str_rev_iter2).item ();
+      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i]);
 
       // Advance each iterator via postfix increment.
-      stable_fwd_iter_++;
-      stable_rev_iter_++;
-      deprecated_fwd_iter_++;
-      deprecated_rev_iter_++;
+      int_int_iter1++;
+      int_str_iter1++;
+      str_int_iter1++;
+      str_str_iter1++;
+      int_int_rev_iter1++;
+      int_str_rev_iter1++;
+      str_int_rev_iter1++;
+      str_str_rev_iter1++;
+      int_int_iter2++;
+      int_str_iter2++;
+      str_int_iter2++;
+      str_str_iter2++;
+      int_int_rev_iter2++;
+      int_str_rev_iter2++;
+      str_int_rev_iter2++;
+      str_str_rev_iter2++;
     }
 
   // Make sure each item in each tree has been visited a second time.
-  ACE_ASSERT (stable_fwd_iter_.done () == 1);
-  ACE_ASSERT (stable_rev_iter_.done () == 1);
-  ACE_ASSERT (deprecated_fwd_iter_.done () == 1);
-  ACE_ASSERT (deprecated_rev_iter_.done () == 1);
-}
+  ACE_ASSERT (int_int_rev_iter1.done () == 1);
+  ACE_ASSERT (int_str_rev_iter1.done () == 1);
+  ACE_ASSERT (str_int_rev_iter1.done () == 1);
+  ACE_ASSERT (str_str_rev_iter1.done () == 1);
+  ACE_ASSERT (int_int_rev_iter2.done () == 1);
+  ACE_ASSERT (int_str_rev_iter2.done () == 1);
+  ACE_ASSERT (str_int_rev_iter2.done () == 1);
+  ACE_ASSERT (str_str_rev_iter2.done () == 1);
+  ACE_ASSERT (int_int_iter1.done () == 1);
+  ACE_ASSERT (int_str_iter1.done () == 1);
+  ACE_ASSERT (str_int_iter1.done () == 1);
+  ACE_ASSERT (str_str_iter1.done () == 1);
+  ACE_ASSERT (int_int_iter2.done () == 1);
+  ACE_ASSERT (int_str_iter2.done () == 1);
+  ACE_ASSERT (str_int_iter2.done () == 1);
+  ACE_ASSERT (str_str_iter2.done () == 1);
 
+  ACE_END_TEST;
+  return 0;
+}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_RB_Tree_Test<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<int, int>;
 template class ACE_RB_Tree_Iterator_Base<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Test<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Node<int, const char *>;
-template class ACE_RB_Tree_Iterator_Base<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Iterator<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Test<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Node<const char *, int>;
-template class ACE_RB_Tree_Iterator_Base<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Iterator<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Test<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Node<const char *, const char *>;
-template class ACE_RB_Tree_Iterator_Base<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Iterator<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Node<int, char *>;
+template class ACE_RB_Tree_Iterator_Base<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Reverse_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
+template class ACE_RB_Tree<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Node<char *, int>;
+template class ACE_RB_Tree_Iterator_Base<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Reverse_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Node<char *, char *>;
+template class ACE_RB_Tree_Iterator_Base<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>;
+template class ACE_RB_Tree_Reverse_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>;
 template class ACE_Less_Than<int>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_RB_Tree_Test<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Node<int, int>
 #pragma instantiate ACE_RB_Tree_Iterator_Base<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Test<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Node<int, const char *>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, const char *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Test<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Node<const char *, int>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, int, ACE_Less_Than<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Test<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Node<const char *, const char *>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<const char *, const char *, ACE_Less_Than<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Node<int, char *>
+#pragma instantiate ACE_RB_Tree_Iterator_Base<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Node<char *, int>
+#pragma instantiate ACE_RB_Tree_Iterator_Base<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Reverse_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Node<char *, char *>
+#pragma instantiate ACE_RB_Tree_Iterator_Base<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree_Reverse_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Less_Than<int>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/RB_Tree_Test.h b/tests/RB_Tree_Test.h
deleted file mode 100644
index e86c34d42d4..00000000000
--- a/tests/RB_Tree_Test.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    RB_Tree_Test.cpp
-//
-// = DESCRIPTION
-//    Header file for a test to verify and illustrate the use of the
-//    ACE_RB_Tree ACE_RB_Tree_Iterator, and
-//    ACE_RB_Tree_Reverse_Iterator classes.
-//    iterator over each.
-//
-// = AUTHOR
-//    Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_RB_Tree_Test
-{
-  // = TITLE
-  //   Implements a templatized test class for the RB_Tree ADT and its
-  //   iterators.
-  //
-  // = DESCRIPTION
-
-  //   To run the test class on a particular type instantiation of the
-  //   RB_Tree, simply instantiate the test class template with the
-  //   same type parameters, and invoke the run_test method.
-public:
-  // = Traits
-
-  typedef ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> 
-          TREE;
-  typedef ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> 
-          ITERATOR;
-  typedef ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> 
-          REVERSE_ITERATOR;
-
-  // = Initialization and termination methods.
-
-  ACE_RB_Tree_Test (int entry_count,
-                    EXT_ID key_array [],
-                    INT_ID item_array [],
-                    int order_index []);
-  // Constructor.
-
-  ~ACE_RB_Tree_Test (void);
-  // Destructor.
-
-  void run_test (void);
-  // Run the individual interface and iteration tests in order.
-
-private:
-
-  void test_tree_insertion (void);
-  // Tests stable and deprecated insertion interfaces.
-
-  void test_post_insertion_iteration (void);
-  // Tests forward and reverse iteration after insertion in both
-  // trees.
-
-  void test_tree_deletion (void);
-  // Tests stable and deprecated deletion interfaces.
-
-  void test_post_deletion_iteration (void);
-  // Tests forward and reverse iteration after deletions in both
-  // trees.
-
-  TREE stable_tree_;
-  // Tree for testing stable interface.
-
-  ITERATOR stable_fwd_iter_;
-  // Forward iterator for tree for testing stable interface.
-
-  REVERSE_ITERATOR stable_rev_iter_;
-  // Forward iterator for tree for testing stable interface.
-
-  TREE deprecated_tree_;
-  // Tree for testing deprecated interface.
-
-  ITERATOR deprecated_fwd_iter_;
-  // Forward iterator for tree for testing deprecated interface.
-
-  REVERSE_ITERATOR deprecated_rev_iter_;
-  // Forward iterator for tree for testing deprecated interface.
-
-  int entry_count_;
-  // Number of entries in the key, item, and index arrays.
-
-  EXT_ID *key_array_;
-  // Array of EXT_IDs (keys) with which to test.
-
-  INT_ID *item_array_;
-  // Array of INT_IDs (items) with which to test.
-
-  int *order_index_;
-  // Order of indices in the key and item arrays.
-
-};
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index bff9127cca0..5b66c4ba70c 100644
--- a/tests/Reactor_Performance_Test.cpp
+++ b/tests/Reactor_Performance_Test.cpp
@@ -110,13 +110,8 @@ Read_Handler::handle_input (ACE_HANDLE handle)
           if (errno == EWOULDBLOCK)
             return 0;
           else
-            {
-              ACE_ERROR ((LM_ERROR, "handle_input: %p (errno: %d)\n",
-                          "recv", errno));
-
-              // This will cause handle_close to get called.
-              return -1;
-            }
+            // This will cause handle_close to get called.
+            return -1;
         }
       else // result == 0
         {
@@ -384,11 +379,11 @@ main (int argc, ASYS_TCHAR *argv[])
                 ASYS_TEXT ("(%t) %p\n"),
                 ASYS_TEXT ("thread create failed")));
 
-  ACE_Time_Value run_limit (opt_nloops / 10);
+  ACE_Time_Value run_limit (10);
 
   ACE_Profile_Timer timer;
   timer.start ();
-  const int status = ACE_Reactor::instance()->run_event_loop (run_limit);
+  ACE_Reactor::instance()->run_event_loop (run_limit);
   timer.stop ();
 
   ACE_Profile_Timer::ACE_Elapsed_Time et;
@@ -403,7 +398,7 @@ main (int argc, ASYS_TCHAR *argv[])
   ACE_Thread_Manager::instance ()->wait ();
 
   ACE_END_TEST;
-  return status;
+  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp
index 9605321d521..4def4a3ad1d 100644
--- a/tests/SOCK_Connector_Test.cpp
+++ b/tests/SOCK_Connector_Test.cpp
@@ -83,14 +83,7 @@ find_another_host (ASYS_TCHAR other_host[])
       ACE_OS::strcpy (other_host, ASYS_WIDE_STRING (h->h_name));
 
       // @@ We really need to add wrappers for these hostent methods.
-
-      // AIX 4.3 has problems with DNS usage when sethostent(1) is called -
-      // further DNS lookups don't work at all.
-#if defined (ACE_AIX_MINOR_VERS) && (ACE_AIX_MINOR_VERS == 3)
-      sethostent (0);
-#else
       sethostent (1);
-#endif
 
       while ((h = gethostent ()) != NULL)
         {
@@ -135,13 +128,7 @@ fail_no_listener_nonblocking (void)
 
   find_another_host (test_host);
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Testing to host \"%s\"\n"), test_host));
-  if (nobody_home.set ((u_short) 42000, test_host) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Host lookup for %s %p\n"),
-                  test_host, ASYS_TEXT ("failed")));
-      return -1;
-    }
-
+  nobody_home.set ((u_short) 42000, test_host);
   status = con.connect (sock, nobody_home, &nonblock);
 
   // Need a port that will fail.
@@ -172,8 +159,7 @@ fail_no_listener_nonblocking (void)
   else
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("Test not executed fully; "
-                             "expected EWOULDBLOCK, %p (%d)\n"),
+                  ASYS_TEXT ("Test not executed fully; expected EWOULDBLOCK, %p (%d)\n"),
                   ASYS_TEXT ("not"), errno));
       status = -1;
     }
@@ -203,12 +189,7 @@ succeed_nonblocking (void)
 
   find_another_host (test_host);
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Testing to host \"%s\"\n"), test_host));
-  if (echo_server.set ((u_short) 7, test_host) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Host lookup for %s %p\n"),
-                  test_host, ASYS_TEXT ("failed")));
-      return -1;
-    }
+  echo_server.set ((u_short) 7, test_host);
   status = con.connect (sock, echo_server, &nonblock);
 
   // Need to test the call to 'complete' really.
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/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp
deleted file mode 100644
index 7ed44e3a7f9..00000000000
--- a/tests/Svc_Handler_Test.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Svc_Handler_Test.cpp
-//
-// = DESCRIPTION
-//    This tests illustrates the "buffering" strategy of the
-//    <ACE_Buffered_Svc_Handler>.
-//
-// = AUTHORS
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "test_config.h"
-#include "ace/FILE_Connector.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Synch.h"
-
-ACE_RCSID(tests, Svc_Handler_Test, "$Id$")
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-typedef ACE_Buffered_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH> SVC_HANDLER;
-
-static void
-run_test (SVC_HANDLER &svc_handler,
-               size_t iterations)
-{
-  // Create a whole slew of message blocks and pass them to the
-  // <svc_handler>.
-  for (size_t i = 0; i < iterations; i++)
-    {
-      ACE_Message_Block *mb;
-      ACE_NEW (mb,
-               ACE_Message_Block (sizeof ("hello ")));
-
-      ACE_Message_Block *cb1;
-      ACE_NEW (cb1,
-               ACE_Message_Block (sizeof ("there\n")));
-
-      ACE_Message_Block *cb2;
-      ACE_NEW (cb2,
-               ACE_Message_Block (sizeof ("there\n")));
-
-      mb->copy ("hello ",
-                ACE_OS::strlen ("hello "));
-      cb1->copy ("there ",
-                 ACE_OS::strlen ("there "));
-      mb->cont (cb1);
-      cb2->copy ("doug\n",
-                ACE_OS::strlen ("doug\n"));
-      cb1->cont (cb2);
-      
-      // Note that this is a buffered call!
-      if (svc_handler.put (mb) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("%p\n"),
-                    ASYS_TEXT ("put")));
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("final flush\n")));
-
-  // Make sure to flush everything out before we exit.
-  if (svc_handler.flush () == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("flush")));
-}
-
-int
-main (int argc, ASYS_TCHAR *argv[])
-{
-  ACE_START_TEST (ASYS_TEXT ("Svc_Handler_Test"));
-  {
-    size_t max_buffer_size = BUFSIZ;
-    size_t iterations = 10;
-
-    if (argc > 1)
-      max_buffer_size = ACE_OS::atoi (argv[1]);
-    if (argc > 2)
-      iterations = ACE_OS::atoi (argv[2]);
-
-    ACE_FILE_Connector connector;
-    ACE_FILE_IO file_io;
-    // Create a temporary filename.
-    ACE_FILE_Addr file (ACE_sap_any_cast (ACE_FILE_Addr &));
-
-    // Open up the temp file.
-    if (connector.connect (file_io,
-                           file) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("open failed for %p\n"),
-                         file.get_path_name ()),
-                        1);
-    else if (file_io.unlink () == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("unlink failed for %p\n"),
-                         file.get_path_name ()),
-                        1);
-
-    // Create the service handler and assign it <file_io> as its data
-    // sink.
-    SVC_HANDLER svc_handler (0,
-                             0,
-                             0,
-                             max_buffer_size,
-                             0);
-    svc_handler.peer () = file_io;
-    
-    // Run the test.
-    run_test (svc_handler, iterations);
-  }
-  ACE_END_TEST;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Buffered_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Buffered_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Svc_Handler_Test.dsp b/tests/Svc_Handler_Test.dsp
deleted file mode 100644
index 2425d913f88..00000000000
--- a/tests/Svc_Handler_Test.dsp
+++ /dev/null
@@ -1,224 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Svc_Handler_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=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 

-!MESSAGE NMAKE /f "Svc_Handler_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 "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 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "Svc_Handler_Test - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Svc_Handler_Test\Debug"

-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\Debug"

-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_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)" == "Svc_Handler_Test - Win32 Alpha Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Svc_Handler_Test\Alpha Debug"

-# PROP BASE Intermediate_Dir "Svc_Handler_Test\Alpha 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 "Debug"

-# 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

-# 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 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"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Svc_Handler_Test - Win32 Debug"

-# Name "Svc_Handler_Test - 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=.\Svc_Handler_Test.cpp

-

-!IF  "$(CFG)" == "Svc_Handler_Test - Win32 Debug"

-

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

-

-DEP_CPP_TASK_=\

-	"..\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\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\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\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\stdcpp.h"\

-	"..\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"\

-	

-

-!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/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp
index 8d1711e9f10..a739a8aa180 100644
--- a/tests/Thread_Manager_Test.cpp
+++ b/tests/Thread_Manager_Test.cpp
@@ -41,12 +41,11 @@ static u_int n_threads = ACE_MAX_THREADS;
 // Helper function that looks for an existing entry in the signalled
 // array.  Also finds the position of the first unused entry in the
 // array, and updates if requested with the t_id.
-extern "C" int
-been_signalled (const ACE_thread_t t_id,
-                const u_int update = 0)
+extern "C"
+int
+been_signalled (const ACE_thread_t t_id, const u_int update = 0)
 {
   u_int unused_slot = n_threads;
-
   for (u_int i = 0; i < n_threads; ++i)
     {
       if (ACE_OS::thr_equal (signalled[i], t_id))
@@ -55,8 +54,7 @@ been_signalled (const ACE_thread_t t_id,
 
       if (update  &&
           unused_slot == n_threads  &&
-          ACE_OS::thr_equal (signalled[i],
-                             ACE_OS::NULL_thread))
+          ACE_OS::thr_equal (signalled[i], ACE_OS::NULL_thread))
         unused_slot = i;
     }
 
@@ -72,7 +70,8 @@ been_signalled (const ACE_thread_t t_id,
 // dynamically allocated, before spawning any threads.
 static ACE_Barrier *thread_start = 0;
 
-extern "C" void
+extern "C"
+void
 handler (int /* signum */)
 {
   if (signalled)
@@ -91,8 +90,7 @@ worker (int iterations)
 {
 #if defined (VXWORKS)
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) %s: stack size is %u\n"),
-              ACE_OS::thr_self (),
-              ACE_OS::thr_min_stack ()));
+              ACE_OS::thr_self (), ACE_OS::thr_min_stack ()));
 #endif /* VXWORKS */
 
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
@@ -156,17 +154,13 @@ main (int, ASYS_TCHAR *[])
   // Dynamically allocate signalled so that we can control when it
   // gets deleted.  Specifically, we need to delete it before the main
   // thread's TSS is cleaned up.
-  ACE_NEW_RETURN (signalled,
-                  ACE_thread_t[n_threads],
-                  1);
+  ACE_NEW_RETURN (signalled, ACE_thread_t[n_threads], 1);
   // Initialize each ACE_thread_t to avoid Purify UMR's.
   for (i = 0; i < n_threads; ++i)
     signalled[i] = ACE_OS::NULL_thread;
 
   // And similarly, dynamically allocate the thread_start barrier.
-  ACE_NEW_RETURN (thread_start,
-                  ACE_Barrier (n_threads + 1),
-                  -1);
+  ACE_NEW_RETURN (thread_start, ACE_Barrier (n_threads + 1), -1);
 
   // Register a signal handler.
   ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
@@ -177,26 +171,18 @@ main (int, ASYS_TCHAR *[])
 #if defined (VXWORKS)
   // Assign thread (VxWorks task) names to test that feature.
   ACE_thread_t *thread_name;
-  ACE_NEW_RETURN (thread_name,
-                  ACE_thread_t[n_threads],
-                  -1);
+  ACE_NEW_RETURN (thread_name, ACE_thread_t[n_threads], -1);
 
   // And test the ability to specify stack size.
   size_t *stack_size;
-  ACE_NEW_RETURN (stack_size,
-                  size_t[n_threads],
-                  -1);
+  ACE_NEW_RETURN (stack_size, size_t[n_threads], -1);
 
   for (i = 0; i < n_threads; ++i)
     {
       if (i < n_threads - 1)
         {
-          ACE_NEW_RETURN (thread_name[i],
-                          char[32],
-                          -1);
-          ACE_OS::sprintf (thread_name[i],
-                           ASYS_TEXT ("thread%u"),
-                           i);
+          ACE_NEW_RETURN (thread_name[i], char[32], -1);
+          ACE_OS::sprintf (thread_name[i], ASYS_TEXT ("thread%u"), i);
         }
       else
         // Pass an ACE_thread_t pointer of 0 for the last thread name.
@@ -242,49 +228,39 @@ main (int, ASYS_TCHAR *[])
   // group.
   ACE_OS::sleep (ACE_Time_Value (1));
 
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) resuming group\n")));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) resuming group\n")));
 
   if (thr_mgr->resume_grp (grp_id) == -1)
     {
       ACE_ASSERT (errno == ENOTSUP);
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT (" OK: resume_grp isn't supported with Pthreads\n")));
+      ACE_DEBUG((LM_DEBUG, 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
   // the group.
   ACE_OS::sleep (ACE_Time_Value (1));
 
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) signaling group\n")));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) signaling group\n")));
 
 #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.
+  thr_mgr->kill_grp (grp_id, SIGINT);
 #elif !defined (ACE_HAS_PTHREADS_DRAFT4)
-  ACE_ASSERT (thr_mgr->kill_grp (grp_id,
-                                 SIGINT) != -1);
+  ACE_ASSERT (thr_mgr->kill_grp (grp_id, SIGINT) != -1);
 #else
-  if (thr_mgr->kill_grp (grp_id,
-                         SIGINT) == -1)
+  if (thr_mgr->kill_grp (grp_id, SIGINT) == -1)
     ACE_ASSERT (errno == ENOTSUP);
 #endif /* ACE_HAS_WTHREADS */
 
   // Wait and then cancel all the threads.
   ACE_OS::sleep (ACE_Time_Value (1));
 
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) cancelling group\n")));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) cancelling group\n")));
 
   ACE_ASSERT (thr_mgr->cancel_grp (grp_id) != -1);
 
   // Perform a barrier wait until all the threads have shut down.
-  // But, wait for a limited time, just in case.
+  // But, wait for a limited time because sometimes the test hangs
+  // on SunOS 5.5.1 and 5.7.
   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)
@@ -294,20 +270,19 @@ main (int, ASYS_TCHAR *[])
                     ASYS_TEXT ("maximum wait time of %d msec exceeded\n"),
                                max_wait.msec ()));
       else
-        ACE_ERROR ((LM_ERROR,
-                    "%p\n", "wait"));
+        ACE_OS::perror ("wait");
+
       status = -1;
     }
 
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) main thread finished\n")));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) main thread finished\n")));
 
 #if defined (VXWORKS)
   for (i = 0; i < n_threads - 1; ++i)
     {
       delete [] thread_name[i];
-      // Don't delete the last thread_name, because it points to the
-      // name in the TCB.  It was initially 0.
+      // Don't delete the last thread_name, because it points
+      // to the name in the TCB.  It was initially 0.
     }
   delete [] thread_name;
   delete [] stack_size;
diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp
index 04fcd624c91..f7135d3c44e 100644
--- a/tests/UPIPE_SAP_Test.cpp
+++ b/tests/UPIPE_SAP_Test.cpp
@@ -29,9 +29,7 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
-#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \
-        (defined (ACE_WIN32) && \
-         defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)))
+#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32))
 
 // Global pattern
 static ACE_UPIPE_Addr addr (ACE_TEXT ("pattern"));
@@ -140,17 +138,14 @@ acceptor (void *args)
   ACE_DEBUG ((LM_DEBUG, "(%t) exiting thread\n"));
   return 0;
 }
-#endif /* ACE_HAS_THREADS && defined ACE_HAS_STREAM_PIPES || (ACE_WIN32&&NT4)*/
+#endif /* ACE_HAS_THREADS && defined ACE_HAS_STREAM_PIPES || ACE_WIN32 */
 
 int
 main (int, char *[])
 {
   ACE_START_TEST ("UPIPE_SAP_Test");
 
-#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || \
-        (defined (ACE_WIN32) && \
-         defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)))
-
+#if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32))
   ACE_UPIPE_Acceptor acc (addr);
 
   // Spawn a acceptor thread.
@@ -178,9 +173,11 @@ main (int, char *[])
 #if !defined (ACE_HAS_THREADS)
   ACE_ERROR ((LM_INFO, "threads not supported on this platform\n"));
 #else
+#if !defined (ACE_HAS_STREAM_PIPES) && !defined (ACE_WIN32)
   ACE_ERROR ((LM_INFO, "UPIPE is not supported on this platform\n"));
+#endif /* !defined (ACE_HAS_STREAM_PIPES) && ! defined (ACE_WIN32) */
 #endif /* !defined (ACE_HAS_THREADS) */
-#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32) && NT4) */
+#endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32)) */
 
   ACE_END_TEST;
   return 0;
diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp
index 90e76e41331..e9b194241eb 100644
--- a/tests/Upgradable_RW_Test.cpp
+++ b/tests/Upgradable_RW_Test.cpp
@@ -502,10 +502,8 @@ main (int argc, ASYS_TCHAR *argv[])
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Double_Linked_List<Element>;
-template class ACE_Double_Linked_List_Iterator_Base<Element>;
 template class ACE_Double_Linked_List_Iterator<Element>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Double_Linked_List<Element>
-#pragma instantiate ACE_Double_Linked_List_Iterator_Base<Element>
 #pragma instantiate ACE_Double_Linked_List_Iterator<Element>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Upgradable_RW_Test.h b/tests/Upgradable_RW_Test.h
index c54a4ed63cd..fe378969c21 100644
--- a/tests/Upgradable_RW_Test.h
+++ b/tests/Upgradable_RW_Test.h
@@ -35,13 +35,11 @@ class Element;
 
 class Element
 // =TITEL
-//   The members for the double linked list
+//   The members fo the double linked list
 //
 {
   friend class ACE_Double_Linked_List<Element>;
-  friend class ACE_Double_Linked_List_Iterator_Base<Element>;
   friend class ACE_Double_Linked_List_Iterator<Element>;
-  friend class ACE_Double_Linked_List_Reverse_Iterator<Element>;
 
 public:
   Element (ACE_CString* item = 0, Element* p = 0, Element* n = 0)
diff --git a/tests/run_tests.bat b/tests/run_tests.bat
index 33816c48eba..ba1f6970f23 100644
--- a/tests/run_tests.bat
+++ b/tests/run_tests.bat
@@ -73,7 +73,6 @@ 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
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 8117fb8ef8f..49f311b55dc 100755
--- a/tests/run_tests.psosim
+++ b/tests/run_tests.psosim
@@ -169,8 +169,6 @@ run Enum_Interfaces_Test                # uses ACE::get_ip_interfaces()
 
 run Upgradable_RW_Test                  # uses RW locks
 
-run Svc_Handler_Test			    
-
 echo "Tests complete..."
 
 /bin/rm -f ace_pipe_name pattern $tmp/ace_temp_file $tmp/ace_temp_file2 $tmp/ace_test_file $tmp/Naming_Test*
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index d17259840b3..9e2456ec6dc 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -172,7 +172,6 @@ run SPIPE_Test                          # tests ACE_SPIPE_Acceptor/ACE_Connector
 run UPIPE_SAP_Test                      # tests ACE_UPIPE, ACE_Thread, ACE_Thread_Manager
 
 run Barrier_Test                        # tests ACE_Service_Config, ACE_Barrier
-run Svc_Handler_Test                    # tests ACE_Service_Config buffering and ACE_FILE_IO
 run Buffer_Stream_Test                  # tests ACE_Service_Config, ACE_Stream (ACE_Module, ACE_Task, ACE_Message_Queue)
 run Priority_Buffer_Test                # tests ACE_Service_Config, ACE_Message_Queue
 run Dynamic_Priority_Test               # tests ACE_ACE_Message_Queue, ACE_Dynamic_Message_Queue
diff --git a/tests/run_tests.vxworks b/tests/run_tests.vxworks
index 71e87a02632..3f191d7ec97 100644
--- a/tests/run_tests.vxworks
+++ b/tests/run_tests.vxworks
@@ -224,10 +224,6 @@ ld < Upgradable_RW_Test
 write 2, "Upgradable_RW_Test ", 19
 ace_main; unld "Upgradable_RW_Test"
 
-ld < Svc_Handler_Test
-write 2, "Svc_Handler_Test ", 17
-ace_main; unld "Svc_Handler_Test"
-
 write 2, "\n", 1
 
 memShow
diff --git a/tests/test_config.h b/tests/test_config.h
index cd825452cc7..3effdb8f81d 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -224,6 +224,7 @@ ACE_Test_Output::ACE_Test_Output (void)
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
   this->output_file_ = new OFSTREAM;
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
+
 }
 
 ACE_Test_Output::~ACE_Test_Output (void)
diff --git a/tests/tests.dsw b/tests/tests.dsw
index 48f082785e8..9ab8f873204 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -675,18 +675,6 @@ Package=<4>
 

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

 

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

 

 Package=<5>

diff --git a/tests/version_tests/Svc_Handler_Test.dsp b/tests/version_tests/Svc_Handler_Test.dsp
deleted file mode 100644
index b7013614625..00000000000
--- a/tests/version_tests/Svc_Handler_Test.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Svc_Handler_Test" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

-CFG=Svc_Handler_Test - Win32 DLL Release

-!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 "Svc_Handler_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 "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 DLL Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

-!MESSAGE "Svc_Handler_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

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

-!MESSAGE "Svc_Handler_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Svc_Handler_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")

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

-!MESSAGE "Svc_Handler_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Svc_Handler_Test - Win32 DLL 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)" == "Svc_Handler_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Svc_Handler_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\DLL Release"

-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_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)" == "Svc_Handler_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Svc_Handler_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_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 "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 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Svc_Handler_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Svc_Handler_Test\static Release"

-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\static Release"

-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_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 user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Svc_Handler_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Svc_Handler_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_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)" == "Svc_Handler_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Svc_Handler_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_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)" == "Svc_Handler_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Svc_Handler_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\static Debug"

-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_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)" == "Svc_Handler_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Svc_Handler_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_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)" == "Svc_Handler_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Svc_Handler_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\DLL Debug"

-# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_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"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Svc_Handler_Test - Win32 DLL Release"

-# Name "Svc_Handler_Test - Win32 DLL Unicode Release"

-# Name "Svc_Handler_Test - Win32 static Release"

-# Name "Svc_Handler_Test - Win32 static Unicode Release"

-# Name "Svc_Handler_Test - Win32 static Unicode Debug"

-# Name "Svc_Handler_Test - Win32 static Debug"

-# Name "Svc_Handler_Test - Win32 DLL Unicode Debug"

-# Name "Svc_Handler_Test - Win32 DLL Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\Svc_Handler_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 87a67aa721d..0cdb99fd6f7 100644
--- a/tests/version_tests/version_tests.dsw
+++ b/tests/version_tests/version_tests.dsw
@@ -675,18 +675,6 @@ Package=<4>
 

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

 

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

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

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

-

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

 

 Package=<5>